1 Patch by Robert Scheck <robert@fedoraproject.org> for Ekiga 4.0.1, which backports
2 the following upstream commits (with some minor downstream-only changes to get the
3 Ekiga building) for Boost.Signals2 support:
5 - https://github.com/GNOME/ekiga/commit/12641b735a9886a080949465d4da6d4569822ed2
6 - https://github.com/GNOME/ekiga/commit/44ef7c66d055d01bede6627a8b31e4135f54f807
7 - https://github.com/GNOME/ekiga/commit/95e2daa3953355118abec5a30fb2642a105705b2
8 - https://github.com/GNOME/ekiga/commit/aabf103dcf7f0e61ed1903bc4f37f1dd549fb2ef
9 - https://github.com/GNOME/ekiga/commit/b8ea1fe8c15a4fa6a8bfde5e8b51febc74f8e529
11 This backport makes sense, because unfortunately upstream didn't release anything
12 after Ekiga 4.0.1, while 8c954b8ab3a771900f125375ba652afaf1966d19 just immediately
13 ends with a segmentation fault (which is the latest Git commit as of writing). And
14 openSUSE uses 8c954b8ab3a771900f125375ba652afaf1966d19 from a few months after the
15 Ekiga 4.0.1 release, but with Boost.Signals2 support. While this Git commit leads
16 even to a starting Ekiga, a not picked up inbound ringing phone call leads sooner
17 or later to a segmentation fault (the caller needs to hit the correct point before
18 hanging up and it thus takes sometimes 2-3 tries until it crashes). Aside of that,
19 there are graphical glitches in the popup/dialog when actually having a call. And
20 finally quitting Ekiga sometimes also ends with yet another segmentation fault...
22 While I fortunately didn't see any of the above mentioned issues with Ekiga 4.0.1
23 and this Boost.Signals2 backport patch, any before existing old Ekiga 4.0.1 issues
24 will exist further on for sure...
26 --- ekiga-4.0.1/configure.ac 2019-05-16 20:32:30.610373983 +0200
27 +++ ekiga-4.0.1/configure.ac.boost-signals2 2019-05-16 22:11:08.958062692 +0200
29 dnl ###############################
30 dnl Mandatory BOOST support
31 dnl ###############################
32 -AX_BOOST_BASE([1.34])
34 +AX_BOOST_BASE([1.53])
36 -if test "x${ax_cv_boost_signals}" == "xno"; then
37 - AC_MSG_ERROR([You need the boost signals library to compile Ekiga])
39 +CPPFLAGS_save="$CPPFLAGS"
40 +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
41 +AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no)
42 +CPPFLAGS="$CPPFLAGS_save"
44 -BOOST_LIBS="${BOOST_SIGNALS_LIB}"
46 +if test "x$found_signals2" = "xno"; then
47 + AC_MSG_ERROR([Could not find BOOST signals2 headers])
51 dnl ###############################
53 AC_MSG_ERROR([You need ptlib expat support to compile ekiga])
56 +# Make sure ptlib and opal don't force no-exceptions,
57 +# as we need them for boost's signals2
58 +PTLIB_CFLAGS="$PTLIB_CFLAGS -fexceptions"
59 +AC_SUBST(PTLIB_CFLAGS)
60 +OPAL_CFLAGS="$OPAL_CFLAGS -fexceptions"
61 +AC_SUBST(OPAL_CFLAGS)
64 AC_ARG_ENABLE([opal-debug],
65 [AS_HELP_STRING([--enable-opal-debug],[link to debug versions of opal and ptlib (opal_d and ptlib_d) (default is disabled)])],
66 --- ekiga-4.0.1/lib/engine/account/account-core.h 2012-11-07 21:43:51.000000000 +0100
67 +++ ekiga-4.0.1/lib/engine/account/account-core.h.boost-signals2 2019-05-16 20:34:25.949622624 +0200
70 /** This signal is emitted when a bank has been added to the core
72 - boost::signal1<void, BankPtr> bank_added;
73 + boost::signals2::signal<void(BankPtr)> bank_added;
75 /** This signal is emitted when a bank has been removed from the core
77 - boost::signal1<void, BankPtr> bank_removed;
78 + boost::signals2::signal<void(BankPtr)> bank_removed;
80 /** This signal is emitted when a account has been added to one of
83 - boost::signal2<void, BankPtr, AccountPtr> account_added;
84 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
86 /** This signal is emitted when a account has been removed from one of
89 - boost::signal2<void, BankPtr, AccountPtr> account_removed;
90 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
92 /** This signal is emitted when a account has been updated in one of
95 - boost::signal2<void, BankPtr, AccountPtr> account_updated;
96 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
101 /** This signal is emitted when the AccountCore Service has been
104 - boost::signal0<void> updated;
105 + boost::signals2::signal<void(void)> updated;
108 /** This chain allows the AccountCore to present forms to the user
109 --- ekiga-4.0.1/lib/engine/account/bank.h 2012-11-07 21:43:51.000000000 +0100
110 +++ ekiga-4.0.1/lib/engine/account/bank.h.boost-signals2 2019-05-16 20:35:52.157810900 +0200
113 /** This signal is emitted when a account has been added.
115 - boost::signal1<void, AccountPtr> account_added;
116 + boost::signals2::signal<void(AccountPtr)> account_added;
118 /** This signal is emitted when a account has been removed.
120 - boost::signal1<void, AccountPtr> account_removed;
121 + boost::signals2::signal<void(AccountPtr)> account_removed;
123 /** This signal is emitted when a account has been updated.
125 - boost::signal1<void, AccountPtr> account_updated;
126 + boost::signals2::signal<void(AccountPtr)> account_updated;
128 /** This chain allows the BankImpl to present forms to the user
130 --- ekiga-4.0.1/lib/engine/account/bank-impl.h 2012-11-07 21:43:51.000000000 +0100
131 +++ ekiga-4.0.1/lib/engine/account/bank-impl.h.boost-signals2 2019-05-16 20:34:41.093655548 +0200
133 template<class AccountType = Account>
136 - public boost::signals::trackable,
137 + public boost::signals2::trackable,
138 protected RefLister<AccountType>
141 --- ekiga-4.0.1/lib/engine/addressbook/book.h 2012-11-07 21:43:51.000000000 +0100
142 +++ ekiga-4.0.1/lib/engine/addressbook/book.h.boost-signals2 2019-05-16 20:36:30.212894662 +0200
145 /** This signal is emitted when a Contact has been added to the Book.
147 - boost::signal1<void, ContactPtr > contact_added;
148 + boost::signals2::signal<void(ContactPtr)> contact_added;
151 /** This signal is emitted when a Contact has been removed from the Book.
153 - boost::signal1<void, ContactPtr > contact_removed;
154 + boost::signals2::signal<void(ContactPtr)> contact_removed;
157 /** This signal is emitted when a Contact has been updated in the Book.
159 - boost::signal1<void, ContactPtr > contact_updated;
160 + boost::signals2::signal<void(ContactPtr)> contact_updated;
163 typedef boost::shared_ptr<Book> BookPtr;
164 --- ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp 2013-02-18 22:36:51.000000000 +0100
165 +++ ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp.boost-signals2 2019-05-16 21:26:27.190245510 +0200
168 Ekiga::ContactCore::~ContactCore ()
170 - for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
171 + for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
175 --- ekiga-4.0.1/lib/engine/addressbook/contact-core.h 2013-02-18 22:36:51.000000000 +0100
176 +++ ekiga-4.0.1/lib/engine/addressbook/contact-core.h.boost-signals2 2019-05-16 21:26:20.542228371 +0200
177 @@ -118,37 +118,37 @@
178 /** This signal is emitted when a Ekiga::Source has been
179 * added to the ContactCore Service.
181 - boost::signal1<void, SourcePtr > source_added;
182 + boost::signals2::signal<void(SourcePtr)> source_added;
184 /** This signal is emitted when a book has been added to one of
187 - boost::signal2<void, SourcePtr, BookPtr > book_added;
188 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
190 /** This signal is emitted when a book has been removed from one of
193 - boost::signal2<void, SourcePtr, BookPtr > book_removed;
194 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
196 /** This signal is emitted when a book has been updated in one of
199 - boost::signal2<void, SourcePtr, BookPtr > book_updated;
200 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
202 /** This signal is emitted when a contact has been added to one of
203 * the book of one of the sources
205 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
206 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
208 /** This signal is emitted when a contact has been removed from one of
209 * the book of one of the sources
211 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
212 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
214 /** This signal is emitted when a contact has been updated in one of
215 * the book of one of the sources
217 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
218 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
223 std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
226 - std::list<boost::signals::connection> conns;
227 + std::list<boost::signals2::connection> conns;
231 --- ekiga-4.0.1/lib/engine/addressbook/source.h 2012-11-07 21:43:51.000000000 +0100
232 +++ ekiga-4.0.1/lib/engine/addressbook/source.h.boost-signals2 2019-05-16 20:38:37.038176631 +0200
235 /** This signal is emitted when a Book has been added to the Source.
237 - boost::signal1<void, BookPtr > book_added;
238 + boost::signals2::signal<void(BookPtr)> book_added;
241 /** This signal is emitted when a Book has been updated in the Source.
243 - boost::signal1<void, BookPtr > book_updated;
244 + boost::signals2::signal<void(BookPtr)> book_updated;
247 /** This signal is emitted when a Book has been removed in the Source.
249 - boost::signal1<void, BookPtr > book_removed;
250 + boost::signals2::signal<void(BookPtr)> book_removed;
252 /** This signal is emitted when a Contact has been added to a book in
255 - boost::signal2<void, BookPtr, ContactPtr > contact_added;
256 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
258 /** This signal is emitted when a Contact has been removed from a book in
261 - boost::signal2<void, BookPtr, ContactPtr > contact_removed;
262 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
264 /** This signal is emitted when a Contact has been updated in a book in
267 - boost::signal2<void, BookPtr, ContactPtr > contact_updated;
268 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
271 typedef boost::shared_ptr<Source> SourcePtr;
272 --- ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h 2012-11-07 21:43:51.000000000 +0100
273 +++ ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h.boost-signals2 2019-05-16 20:39:25.511285526 +0200
275 /** This signal is emitted when a Ekiga::AudioInputManager has been
276 * added to the AudioInputCore Service.
278 - boost::signal1<void, AudioInputManager &> manager_added;
279 + boost::signals2::signal<void(AudioInputManager &)> manager_added;
282 /*** AudioInput Device Management ***/
283 @@ -254,23 +254,23 @@
285 /** See audioinput-manager.h for the API
287 - boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
288 - boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
289 - boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
290 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
291 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
292 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error;
294 /** This signal is emitted when an audio device input has been added to the system.
295 * This signal will be emitted if add_device was called with a device name and
296 * a manager claimed support for this device.
297 * @param device the audio input device that was added.
299 - boost::signal2<void, AudioInputDevice, bool> device_added;
300 + boost::signals2::signal<void(AudioInputDevice, bool)> device_added;
302 /** This signal is emitted when an audio input device has been removed from the system.
303 * This signal will be emitted if remove_device was called with a device name and
304 * a manager claimed support for this device.
305 * @param device the audio input device that was removed.
307 - boost::signal2<void, AudioInputDevice, bool> device_removed;
308 + boost::signals2::signal<void(AudioInputDevice, bool)> device_removed;
311 void on_set_device (const AudioInputDevice & device);
312 --- ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h 2012-11-07 21:43:51.000000000 +0100
313 +++ ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h.boost-signals2 2019-05-16 20:40:06.093377163 +0200
315 #define __AUDIOINPUT_MANAGER_H__
318 -#include <boost/signals.hpp>
319 +#include <boost/signals2.hpp>
320 #include <boost/bind.hpp>
322 #include "audioinput-info.h"
323 @@ -148,18 +148,18 @@
324 * @param device the audio input device that was opened.
325 * @param config the current audio input device configuration (current volume, etc.).
327 - boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
328 + boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
330 /** This signal is emitted when an audio input device is closed.
331 * @param device the audio input device that was closed.
333 - boost::signal1<void, AudioInputDevice> device_closed;
334 + boost::signals2::signal<void(AudioInputDevice)> device_closed;
336 /** This signal is emitted when an error occurs when opening a audio input device.
337 * @param device the audio input device that caused the error.
338 * @param error_code the audio input device error code.
340 - boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
341 + boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
345 --- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h 2013-02-18 22:37:04.000000000 +0100
346 +++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h.boost-signals2 2019-05-16 20:40:58.822496863 +0200
348 /** This signal is emitted when a Ekiga::AudioOutputManager has been
349 * added to the AudioOutputCore Service.
351 - boost::signal1<void, AudioOutputManager &> manager_added;
352 + boost::signals2::signal<void(AudioOutputManager &)> manager_added;
355 /** Get a list of all devices supported by all managers registered to the core.
356 @@ -299,23 +299,23 @@
358 /** See audiooutput-manager.h for the API
360 - boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
361 - boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
362 - boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
363 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
364 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
365 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error;
367 /** This signal is emitted when an audio output device has been added to the system.
368 * This signal will be emitted if add_device was called with a device name and
369 * a manager claimed support for this device.
370 * @param device the audio output device that was added.
372 - boost::signal2<void, AudioOutputDevice, bool> device_added;
373 + boost::signals2::signal<void(AudioOutputDevice, bool)> device_added;
375 /** This signal is emitted when an audio output device has been removed from the system.
376 * This signal will be emitted if remove_device was called with a device name and
377 * a manager claimed support for this device.
378 * @param device the audio output device that was removed.
380 - boost::signal2<void, AudioOutputDevice, bool> device_removed;
381 + boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed;
384 void on_set_device (const AudioOutputDevice & device);
385 --- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h 2012-11-07 21:43:51.000000000 +0100
386 +++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h.boost-signals2 2019-05-16 20:41:41.638594580 +0200
388 #define __AUDIOOUTPUT_MANAGER_H__
391 -#include <boost/signals.hpp>
392 +#include <boost/signals2.hpp>
393 #include <boost/bind.hpp>
395 #include "audiooutput-info.h"
396 @@ -152,20 +152,20 @@
397 * @param device the audio output device that was opened.
398 * @param config the current audio output device configuration (current volume, etc.).
400 - boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
401 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
403 /** This signal is emitted when an audio output device is closed.
404 * @param prim whether the primary or secondary audio output device was closed.
405 * @param device the audio output device that was closed.
407 - boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
408 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
410 /** This signal is emitted when an error occurs when opening an audio output device.
411 * @param prim whether the primary or secondary audio output device caused the error.
412 * @param device the audio output device that caused the error.
413 * @param error_code the audio output device error code.
415 - boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
416 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
419 typedef struct ManagerState {
420 --- ekiga-4.0.1/lib/engine/chat/chat-core.h 2012-11-07 21:43:51.000000000 +0100
421 +++ ekiga-4.0.1/lib/engine/chat/chat-core.h.boost-signals2 2019-05-16 20:42:03.614644914 +0200
423 /** This signal is emitted when an Ekiga::Dialect has been added to
424 * the ChatCore service.
426 - boost::signal1<void, DialectPtr > dialect_added;
427 + boost::signals2::signal<void(DialectPtr)> dialect_added;
433 /** This signal is emitted when the ChatCore service has been updated.
435 - boost::signal0<void> updated;
436 + boost::signals2::signal<void(void)> updated;
438 /** This chain allows the ChatCore to present forms to the user
440 --- ekiga-4.0.1/lib/engine/chat/chat.h 2012-11-07 21:43:51.000000000 +0100
441 +++ ekiga-4.0.1/lib/engine/chat/chat.h.boost-signals2 2019-05-16 20:42:45.038740118 +0200
446 -#include <boost/signals.hpp>
447 +#include <boost/signals2.hpp>
448 #include <boost/bind.hpp>
450 #include <boost/smart_ptr.hpp>
451 @@ -113,15 +113,15 @@
453 /** This signal is emitted when the Chat has been updated.
455 - boost::signal0<void> updated;
456 + boost::signals2::signal<void(void)> updated;
458 /** This signal is emitted when the user requested to see this Chat
460 - boost::signal0<void> user_requested;
461 + boost::signals2::signal<void(void)> user_requested;
463 /** This signal is emitted when the Chat has been removed.
465 - boost::signal0<void> removed;
466 + boost::signals2::signal<void(void)> removed;
468 /** Feed possible actions on this Chat to the given MenuBuilder
469 * @param A MenuBuilder object to populate.
470 --- ekiga-4.0.1/lib/engine/chat/dialect.h 2012-11-07 21:43:51.000000000 +0100
471 +++ ekiga-4.0.1/lib/engine/chat/dialect.h.boost-signals2 2019-05-16 20:43:23.359828571 +0200
473 /** This signal is emitted when an Ekiga::SimpleChat has been added to
476 - boost::signal1<void, SimpleChatPtr> simple_chat_added;
477 + boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
479 /** This signal is emitted when an Ekiga::MultipleChat has been added to
482 - boost::signal1<void, MultipleChatPtr> multiple_chat_added;
483 + boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added;
485 /** This chain allows the Dialect to present forms to the user.
487 --- ekiga-4.0.1/lib/engine/chat/dialect-impl.h 2013-02-18 22:36:51.000000000 +0100
488 +++ ekiga-4.0.1/lib/engine/chat/dialect-impl.h.boost-signals2 2019-05-16 21:27:11.112358866 +0200
490 typename MultipleChatType = MultipleChat>
493 - public boost::signals::trackable
494 + public boost::signals2::trackable
500 /* More STL-like ways to access the chats within this Ekiga::DialectImpl
502 - typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
503 - typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
504 - typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
505 - typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
506 + typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
507 + typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
508 + typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
509 + typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
511 simple_iterator simple_begin ();
512 simple_iterator simple_end ();
517 - std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
518 - std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
519 + std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
520 + std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
522 void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
524 @@ -133,22 +133,22 @@
525 template<typename SimpleChatType, typename MultipleChatType>
526 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
528 - for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
529 + for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
530 iter != simple_chats.end ();
533 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
534 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
535 conn_iter != iter->second.end ();
538 conn_iter->disconnect ();
541 - for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
542 + for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
543 iter != multiple_chats.end ();
546 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
547 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
548 conn_iter != iter->second.end ();
555 - for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
556 + for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin ();
557 go_on && iter != simple_chats.end ();
564 - for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
565 + for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
566 go_on && iter != multiple_chats.end ();
571 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
573 - for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
574 + for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
575 iter != simple_chats[chat].end ();
580 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
582 - for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
583 + for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin ();
584 iter != multiple_chats[chat].end ();
587 --- ekiga-4.0.1/lib/engine/components/call-history/history-book.h 2013-02-18 22:36:51.000000000 +0100
588 +++ ekiga-4.0.1/lib/engine/components/call-history/history-book.h.boost-signals2 2019-05-16 20:43:58.286909503 +0200
593 - public boost::signals::trackable
594 + public boost::signals2::trackable
602 - boost::signal0<void> cleared;
603 + boost::signals2::signal<void(void)> cleared;
607 --- ekiga-4.0.1/lib/engine/components/call-history/history-contact.h 2013-02-18 22:36:51.000000000 +0100
608 +++ ekiga-4.0.1/lib/engine/components/call-history/history-contact.h.boost-signals2 2019-05-16 20:44:24.678970855 +0200
612 public Ekiga::Contact,
613 - public boost::signals::trackable
614 + public boost::signals2::trackable
618 --- ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h 2013-02-18 22:36:51.000000000 +0100
619 +++ ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h.boost-signals2 2019-05-16 20:45:18.111095580 +0200
622 public Ekiga::ClusterImpl<Heap>,
623 public Ekiga::Trigger,
624 - public boost::signals::trackable
625 + public boost::signals2::trackable
629 --- ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h 2013-02-18 22:36:51.000000000 +0100
630 +++ ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h.boost-signals2 2019-05-16 20:45:33.511131655 +0200
632 * This signal makes the Local::Heap know that the XML tree changed
633 * and hence should be saved
635 - boost::signal0<void> trigger_saving;
636 + boost::signals2::signal<void(void)> trigger_saving;
640 --- ekiga-4.0.1/lib/engine/components/opal/opal-account.h 2013-02-18 22:37:04.000000000 +0100
641 +++ ekiga-4.0.1/lib/engine/components/opal/opal-account.h.boost-signals2 2019-05-16 20:45:50.751172106 +0200
644 const std::string as_string () const;
646 - boost::signal0<void> trigger_saving;
647 + boost::signals2::signal<void(void)> trigger_saving;
650 * This is because an opal account is an Ekiga::PresencePublisher
651 --- ekiga-4.0.1/lib/engine/components/opal/opal-call.h 2013-02-18 22:37:04.000000000 +0100
652 +++ ekiga-4.0.1/lib/engine/components/opal/opal-call.h.boost-signals2 2019-05-16 20:46:08.255213249 +0200
657 - public boost::signals::trackable
658 + public boost::signals2::trackable
662 --- ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp 2013-02-18 22:36:51.000000000 +0100
663 +++ ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp.boost-signals2 2019-05-16 20:46:26.119255313 +0200
668 -#include <boost/signals.hpp>
669 +#include <boost/signals2.hpp>
670 #include <boost/bind.hpp>
673 --- ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h 2012-11-07 21:43:51.000000000 +0100
674 +++ ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h.boost-signals2 2019-05-16 21:15:28.782572221 +0200
676 #ifndef __CHAIN_OF_RESPONSIBILITY_H__
677 #define __CHAIN_OF_RESPONSIBILITY_H__
679 -#include <boost/signals.hpp>
680 +#include <boost/signals2.hpp>
681 #include <boost/bind.hpp>
683 /* This code uses boost signals to implement the "chain of responsibility"
686 template<typename T_request>
687 struct ChainOfResponsibility:
688 - public boost::signal1<bool,
690 - responsibility_accumulator>
691 + public boost::signals2::signal<bool(T_request),
692 + responsibility_accumulator>
696 --- ekiga-4.0.1/lib/engine/framework/form-request-simple.h 2012-11-07 21:43:51.000000000 +0100
697 +++ ekiga-4.0.1/lib/engine/framework/form-request-simple.h.boost-signals2 2019-05-16 20:48:12.632507659 +0200
699 #ifndef __FORM_REQUEST_SIMPLE_H__
700 #define __FORM_REQUEST_SIMPLE_H__
702 -#include <boost/signals.hpp>
703 +#include <boost/signals2.hpp>
704 #include <boost/bind.hpp>
706 #include "form-builder.h"
707 --- ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h 2013-02-18 22:36:51.000000000 +0100
708 +++ ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h.boost-signals2 2019-05-16 20:48:33.432557242 +0200
710 #define __GMCONF_BRIDGE_H__
713 -#include <boost/signals.hpp>
714 +#include <boost/signals2.hpp>
715 #include <boost/bind.hpp>
719 * @param key is the GmConf key whose value changed
720 * @param entry is the new GmConf entry
722 - boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
723 + boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed;
726 Ekiga::Service & service;
727 --- ekiga-4.0.1/lib/engine/framework/live-object.h 2012-11-07 21:43:51.000000000 +0100
728 +++ ekiga-4.0.1/lib/engine/framework/live-object.h.boost-signals2 2019-05-16 20:48:53.280604647 +0200
731 /** This signal is emitted when the object has been updated.
733 - boost::signal0<void> updated;
734 + boost::signals2::signal<void(void)> updated;
737 /** This signal is emitted when the object has been removed.
739 - boost::signal0<void> removed;
740 + boost::signals2::signal<void(void)> removed;
742 /** This chain allows the object to present forms to the user
744 --- ekiga-4.0.1/lib/engine/framework/menu-builder.h 2012-11-07 21:43:51.000000000 +0100
745 +++ ekiga-4.0.1/lib/engine/framework/menu-builder.h.boost-signals2 2019-05-16 20:49:09.399643212 +0200
747 #define __MENU_BUILDER_H__
750 -#include <boost/signals.hpp>
751 +#include <boost/signals2.hpp>
752 #include <boost/bind.hpp>
755 --- ekiga-4.0.1/lib/engine/framework/personal-details.h 2012-11-07 21:43:51.000000000 +0100
756 +++ ekiga-4.0.1/lib/engine/framework/personal-details.h.boost-signals2 2019-05-16 20:49:31.152695349 +0200
758 #define __PERSONAL_DETAILS_H__
761 -#include <boost/signals.hpp>
762 +#include <boost/signals2.hpp>
763 #include <boost/bind.hpp>
765 #include "services.h"
767 virtual void set_presence_info (const std::string presence,
768 const std::string status) = 0;
770 - boost::signal0<void> updated;
771 + boost::signals2::signal<void(void)> updated;
775 --- ekiga-4.0.1/lib/engine/framework/reflister.h 2013-02-18 22:36:51.000000000 +0100
776 +++ ekiga-4.0.1/lib/engine/framework/reflister.h.boost-signals2 2019-05-16 20:50:53.592893897 +0200
778 #ifndef __REFLISTER_H__
779 #define __REFLISTER_H__
781 -#include <boost/signals.hpp>
782 +#include <boost/signals2.hpp>
783 #include <boost/bind.hpp>
790 - typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
791 + typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
792 typedef Ekiga::map_key_iterator<container_type> iterator;
793 typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
796 void add_object (boost::shared_ptr<ObjectType> obj);
798 void add_connection (boost::shared_ptr<ObjectType> obj,
799 - boost::signals::connection connection);
800 + boost::signals2::connection connection);
802 void remove_object (boost::shared_ptr<ObjectType> obj);
805 const_iterator begin () const;
806 const_iterator end () const;
808 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
809 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
810 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
811 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
812 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
813 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
816 container_type objects;
818 iter != objects.end ();
821 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
822 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
823 conn_iter != iter->second.end ();
827 template<typename ObjectType>
829 Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
830 - boost::signals::connection connection)
831 + boost::signals2::connection connection)
833 objects[obj].push_back (connection);
837 Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
839 - std::list<boost::signals::connection> connections = objects[obj];
840 - for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
841 + std::list<boost::signals2::connection> connections = objects[obj];
842 + for (std::list<boost::signals2::connection>::iterator iter = connections.begin ();
843 iter != connections.end ();
846 --- ekiga-4.0.1/lib/engine/framework/runtime.h 2012-11-07 21:43:51.000000000 +0100
847 +++ ekiga-4.0.1/lib/engine/framework/runtime.h.boost-signals2 2019-05-16 21:15:48.437621428 +0200
852 -#include <boost/signals.hpp>
853 +#include <boost/signals2.hpp>
854 #include <boost/bind.hpp>
856 #ifndef __RUNTIME_H__
857 --- ekiga-4.0.1/lib/engine/framework/services.h 2013-02-18 22:36:51.000000000 +0100
858 +++ ekiga-4.0.1/lib/engine/framework/services.h.boost-signals2 2019-05-16 20:51:40.904008518 +0200
863 -#include <boost/signals.hpp>
864 +#include <boost/signals2.hpp>
865 #include <boost/bind.hpp>
870 void dump (std::ostream &stream) const;
872 - boost::signal1<void, ServicePtr> service_added;
873 + boost::signals2::signal<void(ServicePtr)> service_added;
877 --- ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp 2013-02-18 22:37:04.000000000 +0100
878 +++ ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp.boost-signals2 2019-05-16 20:52:02.689061460 +0200
881 #include "codecsbox.h"
886 #include "codec-description.h"
888 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp 2013-02-18 22:36:51.000000000 +0100
889 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp.boost-signals2 2019-05-16 20:52:22.872110600 +0200
891 GtkAccelGroup *accel;
893 Ekiga::ServiceCore &core;
894 - std::vector<boost::signals::connection> connections;
895 + std::vector<boost::signals2::connection> connections;
897 std::string presence;
901 AccountsWindow *self = ACCOUNTS_WINDOW (obj);
903 - for (std::vector<boost::signals::connection>::iterator iter
904 + for (std::vector<boost::signals2::connection>::iterator iter
905 = self->priv->connections.begin ();
906 iter != self->priv->connections.end ();
910 AccountsWindow *self = NULL;
912 - boost::signals::connection conn;
913 + boost::signals2::connection conn;
915 GtkWidget *vbox = NULL;
916 GtkWidget *menu_bar = NULL;
917 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp 2013-02-18 22:36:51.000000000 +0100
918 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp.boost-signals2 2019-05-16 20:52:40.184152821 +0200
920 _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { }
922 Ekiga::ContactCore & core;
923 - std::vector<boost::signals::connection> connections;
924 + std::vector<boost::signals2::connection> connections;
925 GtkWidget *tree_view;
927 GtkTreeSelection *selection;
930 AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
932 - for (std::vector<boost::signals::connection>::iterator iter
933 + for (std::vector<boost::signals2::connection>::iterator iter
934 = self->priv->connections.begin ();
935 iter != self->priv->connections.end ();
939 AddressBookWindow *self = NULL;
941 - boost::signals::connection conn;
942 + boost::signals2::connection conn;
944 GtkWidget *menu_bar = NULL;
945 GtkWidget *frame = NULL;
946 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
947 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp.boost-signals2 2019-05-16 21:25:50.824151811 +0200
949 GtkWidget *scrolled_window;
952 - std::list<boost::signals::connection> connections;
953 + std::list<boost::signals2::connection> connections;
959 view = BOOK_VIEW_GTK (obj);
961 - for (std::list<boost::signals::connection>::iterator iter
962 + for (std::list<boost::signals2::connection>::iterator iter
963 = view->priv->connections.begin ();
964 iter != view->priv->connections.end ();
966 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
967 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.boost-signals2 2019-05-16 20:53:08.385221735 +0200
969 boost::shared_ptr<History::Book> book;
972 - std::vector<boost::signals::connection> connections;
973 + std::vector<boost::signals2::connection> connections;
976 /* this is what we put in the view */
979 view = CALL_HISTORY_VIEW_GTK (obj);
981 - for (std::vector<boost::signals::connection>::iterator iter
982 + for (std::vector<boost::signals2::connection>::iterator iter
983 = view->priv->connections.begin ();
984 iter != view->priv->connections.end ();
987 GtkCellRenderer *renderer = NULL;
988 GtkTreeSelection *selection = NULL;
990 - boost::signals::connection conn;
991 + boost::signals2::connection conn;
993 g_return_val_if_fail (book, (GtkWidget*)NULL);
995 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp 2013-02-18 22:37:04.000000000 +0100
996 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp.boost-signals2 2019-05-16 20:53:23.457258635 +0200
999 GtkWidget *transfer_call_popup;
1001 - std::vector<boost::signals::connection> connections;
1002 + std::vector<boost::signals2::connection> connections;
1006 @@ -2207,7 +2207,7 @@
1008 ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw)
1010 - boost::signals::connection conn;
1011 + boost::signals2::connection conn;
1013 g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
1015 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp 2013-02-18 22:36:51.000000000 +0100
1016 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp.boost-signals2 2019-05-16 20:53:39.069296908 +0200
1018 struct _ChatAreaPrivate
1021 - boost::signals::connection connection;
1022 + boost::signals2::connection connection;
1023 boost::shared_ptr<ChatAreaHelper> helper;
1024 GmTextBufferEnhancer* enhancer;
1025 GtkWidget* smiley_menu;
1026 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp 2013-02-18 22:36:51.000000000 +0100
1027 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp.boost-signals2 2019-05-16 21:25:41.264127202 +0200
1031 Ekiga::ServiceCore& core;
1032 - std::list<boost::signals::connection> connections;
1033 + std::list<boost::signals2::connection> connections;
1035 GtkWidget* notebook;
1039 self = CHAT_WINDOW (obj);
1041 - for (std::list<boost::signals::connection>::iterator iter
1042 + for (std::list<boost::signals2::connection>::iterator iter
1043 = self->priv->connections.begin ();
1044 iter != self->priv->connections.end ();
1046 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp 2013-02-18 22:36:51.000000000 +0100
1047 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp.boost-signals2 2019-05-16 20:53:55.041336117 +0200
1049 struct _HeapViewPrivate
1051 Ekiga::HeapPtr heap;
1052 - std::vector<boost::signals::connection> connections;
1053 + std::vector<boost::signals2::connection> connections;
1055 GtkTreeStore* store;
1059 if (self->priv->heap) {
1061 - for (std::vector<boost::signals::connection>::iterator iter
1062 + for (std::vector<boost::signals2::connection>::iterator iter
1063 = self->priv->connections.begin ();
1064 iter != self->priv->connections.end ();
1070 - boost::signals::connection conn;
1071 + boost::signals2::connection conn;
1073 conn = heap->removed.connect (boost::bind (&on_heap_removed, self));
1074 self->priv->connections.push_back (conn);
1075 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp 2013-02-18 22:37:04.000000000 +0100
1076 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp.boost-signals2 2019-05-16 20:54:24.433408410 +0200
1079 GtkWidget *fsbutton;
1080 Ekiga::ServiceCore *core;
1081 - std::vector<boost::signals::connection> connections;
1082 + std::vector<boost::signals2::connection> connections;
1083 } GmPreferencesWindow;
1085 #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x)
1086 @@ -1357,7 +1357,7 @@
1088 gm_window_hide_on_delete (window);
1090 - boost::signals::connection conn;
1091 + boost::signals2::connection conn;
1092 boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core");
1093 boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core");
1094 boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
1095 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp 2012-11-07 21:43:51.000000000 +0100
1096 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp.boost-signals2 2019-05-16 20:54:36.777438826 +0200
1098 struct _PresentityViewPrivate
1100 Ekiga::Presentity* presentity;
1101 - boost::signals::connection updated_conn;
1102 - boost::signals::connection removed_conn;
1103 + boost::signals2::connection updated_conn;
1104 + boost::signals2::connection removed_conn;
1106 /* we contain those, so no need to unref them */
1107 GtkWidget* presence_image;
1108 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp 2013-02-18 22:37:04.000000000 +0100
1109 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp.boost-signals2 2019-05-16 20:54:50.449472550 +0200
1112 boost::shared_ptr<Ekiga::PresenceCore> core;
1114 - std::vector<boost::signals::connection> connections;
1115 + std::vector<boost::signals2::connection> connections;
1116 GtkTreeStore *store;
1117 GtkTreeView *tree_view;
1118 GSList *folded_groups;
1119 @@ -1382,7 +1382,7 @@
1121 if (self->priv->core) {
1123 - for (std::vector<boost::signals::connection>::iterator iter
1124 + for (std::vector<boost::signals2::connection>::iterator iter
1125 = self->priv->connections.begin ();
1126 iter != self->priv->connections.end ();
1128 @@ -1393,7 +1393,7 @@
1132 - boost::signals::connection conn;
1133 + boost::signals2::connection conn;
1135 conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1));
1136 self->priv->connections.push_back (conn);
1137 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp 2013-02-18 22:37:04.000000000 +0100
1138 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp.boost-signals2 2019-05-16 20:55:08.249516515 +0200
1140 GtkWidget *popup_menu;
1141 gboolean has_message;
1143 - std::vector<boost::signals::connection> connections;
1144 + std::vector<boost::signals2::connection> connections;
1149 if (self->priv->blink_image)
1150 g_free (self->priv->blink_image);
1152 - for (std::vector<boost::signals::connection>::iterator iter = self->priv->connections.begin () ;
1153 + for (std::vector<boost::signals2::connection>::iterator iter = self->priv->connections.begin () ;
1154 iter != self->priv->connections.end ();
1156 iter->disconnect ();
1158 if (!statusicon_should_run ())
1161 - boost::signals::connection conn;
1162 + boost::signals2::connection conn;
1164 self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL));
1165 self->priv = new StatusIconPrivate (core);
1166 --- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h 2012-11-07 21:43:51.000000000 +0100
1167 +++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h.boost-signals2 2019-05-16 20:55:28.249565992 +0200
1170 #include <gtk/gtk.h>
1172 -#include <boost/signals.hpp>
1173 +#include <boost/signals2.hpp>
1174 #include <boost/bind.hpp>
1177 --- ekiga-4.0.1/lib/engine/hal/hal-core.h 2012-11-07 21:43:51.000000000 +0100
1178 +++ ekiga-4.0.1/lib/engine/hal/hal-core.h.boost-signals2 2019-05-16 20:56:59.929793841 +0200
1181 #include "services.h"
1183 -#include <boost/signals.hpp>
1184 +#include <boost/signals2.hpp>
1185 #include <boost/bind.hpp>
1188 @@ -114,24 +114,24 @@
1189 /** This signal is emitted when an Ekiga::HalManager has been
1190 * added to the HalCore Service.
1192 - boost::signal1<void, HalManager &> manager_added;
1193 + boost::signals2::signal<void(HalManager &)> manager_added;
1196 /*** API to act on HAL events ***/
1198 /** See hal-manager.h for the API
1200 - boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
1201 - boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
1202 + boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added;
1203 + boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed;
1205 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
1206 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
1207 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added;
1208 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed;
1210 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
1211 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
1212 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added;
1213 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed;
1215 - boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
1216 - boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
1217 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up;
1218 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_down;
1222 --- ekiga-4.0.1/lib/engine/hal/hal-manager.h 2012-11-07 21:43:51.000000000 +0100
1223 +++ ekiga-4.0.1/lib/engine/hal/hal-manager.h.boost-signals2 2019-05-16 20:58:32.322025169 +0200
1225 * @param device the device name.
1226 * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
1228 - boost::signal3<void, std::string, std::string, unsigned> videoinput_device_added;
1229 + boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_added;
1231 /** This signal is emitted when a video input device is removed from the system.
1232 * @param source the video input framework (e.g. video4linux, etc.).
1233 * @param device the device name.
1234 * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
1236 - boost::signal3<void, std::string, std::string, unsigned> videoinput_device_removed;
1237 + boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_removed;
1239 /** This signal is emitted when an audio input device is added to the system.
1240 * @param source the audio input framework (e.g. alsa, oss, etc.).
1241 * @param device the device name.
1243 - boost::signal2<void, std::string, std::string> audioinput_device_added;
1244 + boost::signals2::signal<void(std::string, std::string)> audioinput_device_added;
1246 /** This signal is emitted when an audio input device is removed from the system.
1247 * @param source the audio input framework (e.g. alsa, oss, etc.).
1248 * @param device the device name.
1250 - boost::signal2<void, std::string, std::string> audioinput_device_removed;
1251 + boost::signals2::signal<void(std::string, std::string)> audioinput_device_removed;
1253 /** This signal is emitted when an audio output device is added to the system.
1254 * @param source the audio output framework (e.g. alsa, oss, etc.).
1255 * @param device the device name.
1257 - boost::signal2<void, std::string, std::string> audiooutput_device_added;
1258 + boost::signals2::signal<void(std::string, std::string)> audiooutput_device_added;
1260 /** This signal is emitted when an audio output device is removed from the system.
1261 * @param source the audio output framework (e.g. alsa, oss, etc.).
1262 * @param device the device name.
1264 - boost::signal2<void, std::string, std::string> audiooutput_device_removed;
1265 + boost::signals2::signal<void(std::string, std::string)> audiooutput_device_removed;
1267 /** This signal is emitted when a network device comes up.
1268 * @param interface_name the interface name (e.g. eth0, etc.).
1269 * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
1271 - boost::signal2<void, std::string, std::string> network_interface_up;
1272 + boost::signals2::signal<void(std::string, std::string)> network_interface_up;
1274 /** This signal is emitted when a network device goes down.
1275 * @param interface_name the interface name (e.g. eth0, etc.).
1276 * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
1278 - boost::signal2<void, std::string, std::string> network_interface_down;
1279 + boost::signals2::signal<void(std::string, std::string)> network_interface_down;
1283 --- ekiga-4.0.1/lib/engine/notification/notification-core.h 2012-11-07 21:43:51.000000000 +0100
1284 +++ ekiga-4.0.1/lib/engine/notification/notification-core.h.boost-signals2 2019-05-16 20:58:55.762084125 +0200
1286 void action_trigger ()
1287 { if (action_callback) action_callback (); }
1289 - boost::signal0<void> removed;
1290 + boost::signals2::signal<void(void)> removed;
1295 void push_notification (boost::shared_ptr<Notification> notification)
1296 { notification_added (notification); }
1298 - boost::signal1<void, boost::shared_ptr<Notification> > notification_added;
1299 + boost::signals2::signal<void(boost::shared_ptr<Notification>)> notification_added;
1303 --- ekiga-4.0.1/lib/engine/presence/cluster.h 2012-11-07 21:43:51.000000000 +0100
1304 +++ ekiga-4.0.1/lib/engine/presence/cluster.h.boost-signals2 2019-05-16 20:59:44.537207148 +0200
1307 * @param The Heap in question.
1309 - boost::signal1<void, HeapPtr > heap_added;
1310 - boost::signal1<void, HeapPtr > heap_removed;
1311 + boost::signals2::signal<void(HeapPtr)> heap_added;
1312 + boost::signals2::signal<void(HeapPtr)> heap_removed;
1314 /** Those signals are forwarded from the given Heap
1315 * @param The Heap in question.
1317 - boost::signal1<void, HeapPtr > heap_updated;
1318 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_added;
1319 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated;
1320 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed;
1321 + boost::signals2::signal<void(HeapPtr)> heap_updated;
1322 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added;
1323 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated;
1324 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed;
1327 typedef boost::shared_ptr<Cluster> ClusterPtr;
1328 --- ekiga-4.0.1/lib/engine/presence/heap.h 2012-11-07 21:43:51.000000000 +0100
1329 +++ ekiga-4.0.1/lib/engine/presence/heap.h.boost-signals2 2019-05-16 21:00:10.299272312 +0200
1332 /** This signal is emitted when a Presentity has been added to the Heap.
1334 - boost::signal1<void, PresentityPtr > presentity_added;
1335 + boost::signals2::signal<void(PresentityPtr)> presentity_added;
1337 /** This signal is emitted when a Presentity has been updated in the Heap.
1339 - boost::signal1<void, PresentityPtr > presentity_updated;
1340 + boost::signals2::signal<void(PresentityPtr)> presentity_updated;
1342 /** This signal is emitted when a Presentity has been removed from the Heap.
1344 - boost::signal1<void, PresentityPtr > presentity_removed;
1345 + boost::signals2::signal<void(PresentityPtr)> presentity_removed;
1348 typedef boost::shared_ptr<Heap> HeapPtr;
1349 --- ekiga-4.0.1/lib/engine/presence/presence-core.cpp 2013-02-18 22:36:51.000000000 +0100
1350 +++ ekiga-4.0.1/lib/engine/presence/presence-core.cpp.boost-signals2 2019-05-16 21:25:58.111170575 +0200
1353 Ekiga::PresenceCore::~PresenceCore ()
1355 - for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
1356 + for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
1357 iter->disconnect ();
1360 --- ekiga-4.0.1/lib/engine/presence/presence-core.h 2013-02-18 22:36:51.000000000 +0100
1361 +++ ekiga-4.0.1/lib/engine/presence/presence-core.h.boost-signals2 2019-05-16 21:26:09.582200124 +0200
1363 * presence information about an uri it was required to handle.
1364 * The information is given as a pair of strings (uri, data).
1366 - boost::signal2<void, std::string, std::string> presence_received;
1367 - boost::signal2<void, std::string, std::string> status_received;
1368 + boost::signals2::signal<void(std::string, std::string)> presence_received;
1369 + boost::signals2::signal<void(std::string, std::string)> status_received;
1372 class PresencePublisher
1373 @@ -180,22 +180,22 @@
1374 /** This signal is emitted when an Ekiga::Cluster has been added
1375 * to the PresenceCore Service.
1377 - boost::signal1<void, ClusterPtr > cluster_added;
1378 + boost::signals2::signal<void(ClusterPtr)> cluster_added;
1380 /** Those signals are forwarding the heap_added, heap_updated
1381 * and heap_removed from the given Cluster.
1384 - boost::signal2<void, ClusterPtr , HeapPtr > heap_added;
1385 - boost::signal2<void, ClusterPtr , HeapPtr > heap_updated;
1386 - boost::signal2<void, ClusterPtr , HeapPtr > heap_removed;
1387 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added;
1388 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated;
1389 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed;
1391 /** Those signals are forwarding the presentity_added, presentity_updated
1392 * and presentity_removed from the given Heap of the given Cluster.
1394 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added;
1395 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated;
1396 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed;
1397 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added;
1398 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated;
1399 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_removed;
1404 /** Those signals are emitted whenever information has been received
1405 * about an uri ; the information is a pair of strings (uri, information).
1407 - boost::signal2<void, std::string, std::string> presence_received;
1408 - boost::signal2<void, std::string, std::string> status_received;
1409 + boost::signals2::signal<void(std::string, std::string)> presence_received;
1410 + boost::signals2::signal<void(std::string, std::string)> status_received;
1418 - std::list<boost::signals::connection> conns;
1419 + std::list<boost::signals2::connection> conns;
1423 --- ekiga-4.0.1/lib/engine/presence/uri-presentity.h 2013-02-18 22:36:51.000000000 +0100
1424 +++ ekiga-4.0.1/lib/engine/presence/uri-presentity.h.boost-signals2 2019-05-16 21:01:39.841499790 +0200
1427 class URIPresentity:
1428 public Ekiga::Presentity,
1429 - public boost::signals::trackable
1430 + public boost::signals2::trackable
1434 --- ekiga-4.0.1/lib/engine/protocol/call-core.cpp 2013-02-18 22:36:51.000000000 +0100
1435 +++ ekiga-4.0.1/lib/engine/protocol/call-core.cpp.boost-signals2 2019-05-16 21:27:24.447393322 +0200
1438 CallCore::~CallCore ()
1440 - for (std::list<boost::signals::connection>::iterator iter = manager_connections.begin ();
1441 + for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin ();
1442 iter != manager_connections.end ();
1444 iter->disconnect ();
1447 void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
1449 - std::list<boost::signals::connection> conns;
1450 + std::list<boost::signals2::connection> conns;
1452 conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager)));
1453 conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager)));
1456 void CallCore::remove_call (boost::shared_ptr<Call> call)
1458 - for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
1459 + for (std::list<boost::signals2::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
1460 iter2 != call_connections [call->get_id ()].end ();
1462 iter2->disconnect ();
1463 --- ekiga-4.0.1/lib/engine/protocol/call-core.h 2013-02-18 22:36:51.000000000 +0100
1464 +++ ekiga-4.0.1/lib/engine/protocol/call-core.h.boost-signals2 2019-05-16 21:04:18.066905414 +0200
1466 #include "call-protocol-manager.h"
1467 #include <boost/smart_ptr.hpp>
1469 -#include <boost/signals.hpp>
1470 +#include <boost/signals2.hpp>
1471 #include <boost/bind.hpp>
1475 /** This signal is emitted when a Ekiga::CallManager has been
1476 * added to the CallCore Service.
1478 - boost::signal1<void, boost::shared_ptr<CallManager> > manager_added;
1479 + boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added;
1482 /*** Call Management ***/
1483 @@ -141,21 +141,21 @@
1485 /** See call.h for the API
1487 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call;
1488 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call;
1489 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call;
1490 - boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call;
1491 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call;
1492 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call;
1493 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call;
1494 - boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
1495 - boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
1496 - boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused;
1497 - boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed;
1498 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call;
1499 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call;
1500 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call;
1501 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call;
1502 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call;
1503 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call;
1504 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call;
1505 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened;
1506 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed;
1507 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused;
1508 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed;
1511 - boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready;
1512 - boost::signal0<void> ready;
1513 + boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready;
1514 + boost::signals2::signal<void(void)> ready;
1516 /** This chain allows the CallCore to report errors to the user
1521 std::set<boost::shared_ptr<CallManager> > managers;
1522 - std::list<boost::signals::connection> manager_connections;
1523 - std::map<std::string, std::list<boost::signals::connection> > call_connections;
1524 + std::list<boost::signals2::connection> manager_connections;
1525 + std::map<std::string, std::list<boost::signals2::connection> > call_connections;
1529 --- ekiga-4.0.1/lib/engine/protocol/call.h 2013-02-18 22:36:51.000000000 +0100
1530 +++ ekiga-4.0.1/lib/engine/protocol/call.h.boost-signals2 2019-05-16 21:06:43.219275173 +0200
1535 -#include <boost/signals.hpp>
1536 +#include <boost/signals2.hpp>
1537 #include <boost/bind.hpp>
1540 @@ -198,69 +198,69 @@
1542 /* Signal emitted when the call is established
1544 - boost::signal0<void> established;
1545 + boost::signals2::signal<void(void)> established;
1547 /* Signal emitted when an established call is cleared
1548 * @param: a string describing why the call was cleared
1550 - boost::signal1<void, std::string> cleared;
1551 + boost::signals2::signal<void(std::string)> cleared;
1553 /* Signal emitted when the call is missed, ie cleared
1554 * without having been established
1556 - boost::signal0<void> missed;
1557 + boost::signals2::signal<void(void)> missed;
1559 /* Signal emitted when the call is forwarded
1561 - boost::signal0<void> forwarded;
1562 + boost::signals2::signal<void(void)> forwarded;
1564 /* Signal emitted when the call is held
1566 - boost::signal0<void> held;
1567 + boost::signals2::signal<void(void)> held;
1569 /* Signal emitted when the call is retrieved
1571 - boost::signal0<void> retrieved;
1572 + boost::signals2::signal<void(void)> retrieved;
1574 /* Signal emitted when the call is being setup
1576 - boost::signal0<void> setup;
1577 + boost::signals2::signal<void(void)> setup;
1579 /* Signal emitted when the remote party is ringing
1581 - boost::signal0<void> ringing;
1582 + boost::signals2::signal<void(void)> ringing;
1584 /* Signal emitted when a stream is opened
1585 * @param the stream name
1586 * @param the stream type
1587 * @param transmission or reception
1589 - boost::signal3<void, std::string, StreamType, bool> stream_opened;
1590 + boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened;
1592 /* Signal emitted when a stream is closed
1593 * @param the stream name
1594 * @param the stream type
1595 * @param transmission or reception
1597 - boost::signal3<void, std::string, StreamType, bool> stream_closed;
1598 + boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed;
1600 /* Signal emitted when a transmitted stream is paused
1601 * @param the stream name
1602 * @param the stream type
1603 * @param transmission or reception
1605 - boost::signal2<void, std::string, StreamType> stream_paused;
1606 + boost::signals2::signal<void(std::string, StreamType)> stream_paused;
1608 /* Signal emitted when a transmitted stream is resumed
1609 * @param the stream name
1610 * @param the stream type
1611 * @param transmission or reception
1613 - boost::signal2<void, std::string, StreamType> stream_resumed;
1614 + boost::signals2::signal<void(std::string, StreamType)> stream_resumed;
1616 /** This signal is emitted when the Call is removed.
1618 - boost::signal0<void> removed;
1619 + boost::signals2::signal<void(void)> removed;
1623 --- ekiga-4.0.1/lib/engine/protocol/call-manager.h 2012-11-07 21:43:51.000000000 +0100
1624 +++ ekiga-4.0.1/lib/engine/protocol/call-manager.h.boost-signals2 2019-05-16 21:04:48.498983953 +0200
1626 #define __CALL_MANAGER_H__
1629 -#include <boost/signals.hpp>
1630 +#include <boost/signals2.hpp>
1631 #include <boost/bind.hpp>
1633 #include <boost/smart_ptr.hpp>
1635 /** This signal is emitted when a Ekiga::CallProtocolManager has been
1636 * added to the CallManager.
1638 - boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added;
1639 + boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added;
1647 - boost::signal0<void> ready;
1648 + boost::signals2::signal<void(void)> ready;
1651 std::set<boost::shared_ptr<CallProtocolManager> > managers;
1652 --- ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h 2013-02-19 07:11:02.000000000 +0100
1653 +++ ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h.boost-signals2 2019-05-16 21:07:34.924401112 +0200
1655 #include "videoinput-manager.h"
1656 #include "videoinput-gmconf-bridge.h"
1658 -#include <boost/signals.hpp>
1659 +#include <boost/signals2.hpp>
1660 #include <boost/bind.hpp>
1664 /** This signal is emitted when a Ekiga::VideoInputManager has been
1665 * added to the VideoInputCore Service.
1667 - boost::signal1<void, VideoInputManager &> manager_added;
1668 + boost::signals2::signal<void(VideoInputManager &)> manager_added;
1671 /*** VideoInput Device Management ***/
1672 @@ -277,23 +277,23 @@
1674 /** See videoinput-manager.h for the API
1676 - boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
1677 - boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
1678 - boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
1679 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened;
1680 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed;
1681 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> device_error;
1683 /** This signal is emitted when a video input has been added to the system.
1684 * This signal will be emitted if add_device was called with a device name and
1685 * a manager claimed support for this device.
1686 * @param device the video input device that was added.
1688 - boost::signal2<void, VideoInputDevice, bool> device_added;
1689 + boost::signals2::signal<void(VideoInputDevice, bool)> device_added;
1691 /** This signal is emitted when a video input has been removed from the system.
1692 * This signal will be emitted if remove_device was called with a device name and
1693 * a manager claimed support for this device.
1694 * @param device the video input device that was removed.
1696 - boost::signal2<void, VideoInputDevice, bool> device_removed;
1697 + boost::signals2::signal<void(VideoInputDevice, bool)> device_removed;
1700 void on_set_device (const VideoInputDevice & device);
1701 --- ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h 2012-11-07 21:43:51.000000000 +0100
1702 +++ ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h.boost-signals2 2019-05-16 21:08:07.020479478 +0200
1704 #define __VIDEOINPUT_MANAGER_H__
1707 -#include <boost/signals.hpp>
1708 +#include <boost/signals2.hpp>
1709 #include <boost/bind.hpp>
1711 #include "videoinput-info.h"
1712 @@ -159,18 +159,18 @@
1713 * @param device the video input device that was opened.
1714 * @param config the current video input device configuration (current brightness, colour, etc.).
1716 - boost::signal2<void, VideoInputDevice, VideoInputSettings> device_opened;
1717 + boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened;
1719 /** This signal is emitted when a video input device is closed.
1720 * @param device the video input device that was closed.
1722 - boost::signal1<void, VideoInputDevice> device_closed;
1723 + boost::signals2::signal<void(VideoInputDevice)> device_closed;
1725 /** This signal is emitted when an error occurs when opening a video input device.
1726 * @param device the video input device that caused the error.
1727 * @param error_code the video input device error code.
1729 - boost::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error;
1730 + boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> device_error;
1733 typedef struct ManagerState {
1734 --- ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h 2013-02-18 22:36:51.000000000 +0100
1735 +++ ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h.boost-signals2 2019-05-16 22:08:08.535773653 +0200
1737 #include "videooutput-gmconf-bridge.h"
1738 #include "videooutput-manager.h"
1740 -#include <boost/signals.hpp>
1741 +#include <boost/signals2.hpp>
1742 #include <boost/bind.hpp>
1746 /** This signal is emitted when a Ekiga::VideoOutputManager has been
1747 * added to the VideoOutputCore Service.
1749 - boost::signal1<void, VideoOutputManager &> manager_added;
1750 + boost::signals2::signal<void(VideoOutputManager &)> manager_added;
1753 /*** Videooutput Management ***/
1754 @@ -165,11 +165,11 @@
1756 /** See videooutput-manager.h for the API
1758 - boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
1759 - boost::signal1<void, VideoOutputManager &> device_closed;
1760 - boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
1761 - boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
1762 - boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
1763 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
1764 + boost::signals2::signal<void(VideoOutputManager &)> device_closed;
1765 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error;
1766 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed;
1767 + boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> size_changed;
1771 --- ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h 2013-02-19 07:11:02.000000000 +0100
1772 +++ ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h.boost-signals2 2019-05-16 22:07:52.271747906 +0200
1774 #ifndef __VIDEOOUTPUT_MANAGER_H__
1775 #define __VIDEOOUTPUT_MANAGER_H__
1777 -#include <boost/signals.hpp>
1778 +#include <boost/signals2.hpp>
1779 #include <boost/bind.hpp>
1781 #include "videooutput-info.h"
1782 @@ -108,16 +108,16 @@
1783 * @param both_streams if a frame from both local and remote stream has been received.
1784 * @param ext_stream if a frame from an extended video stream has been received.
1786 - boost::signal5<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
1787 + boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
1789 /** This signal is emitted when a video output device is closed.
1791 - boost::signal0<void> device_closed;
1792 + boost::signals2::signal<void(void)> device_closed;
1794 /** This signal is emitted when an error occurs when opening a video output device.
1795 * @param error_code the video output device error code.
1797 - boost::signal1<void, VideoOutputErrorCodes> device_error;
1798 + boost::signals2::signal<void(VideoOutputErrorCodes)> device_error;
1800 /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode.
1801 * Some managers like DX and XV allow the user to switch between FS
1803 * or when it is being zoomed in or out.
1804 * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated.
1806 - boost::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed;
1807 + boost::signals2::signal<void(VideoOutputFSToggle)> fullscreen_mode_changed;
1809 /** This signal is emitted the video output size has changed.
1810 * This signal is called whenever the size of the widget carrying the video signal
1812 * @param width the new width of the widget.
1813 * @param height the new height of the widget.
1815 - boost::signal2<void, unsigned, unsigned> size_changed;
1816 + boost::signals2::signal<void(unsigned, unsigned)> size_changed;
1819 virtual void get_display_info (DisplayInfo &) { };
1820 --- ekiga-4.0.1/plugins/avahi/avahi-cluster.h 2012-11-07 21:43:51.000000000 +0100
1821 +++ ekiga-4.0.1/plugins/avahi/avahi-cluster.h.boost-signals2 2019-05-16 21:10:04.107766569 +0200
1824 public Ekiga::Service,
1825 public Ekiga::ClusterImpl<Heap>,
1826 - public boost::signals::trackable
1827 + public boost::signals2::trackable
1831 --- ekiga-4.0.1/plugins/avahi/avahi-heap.h 2013-02-18 22:36:51.000000000 +0100
1832 +++ ekiga-4.0.1/plugins/avahi/avahi-heap.h.boost-signals2 2019-05-16 21:10:12.088786207 +0200
1835 public Ekiga::PresenceFetcher,
1836 public Ekiga::HeapImpl<Ekiga::URIPresentity>,
1837 - public boost::signals::trackable
1838 + public boost::signals2::trackable
1842 --- ekiga-4.0.1/plugins/ldap/ldap-book.h 2012-11-07 21:43:51.000000000 +0100
1843 +++ ekiga-4.0.1/plugins/ldap/ldap-book.h.boost-signals2 2019-05-16 21:10:28.275826062 +0200
1846 xmlNodePtr get_node ();
1848 - boost::signal0<void> trigger_saving;
1849 + boost::signals2::signal<void(void)> trigger_saving;
1851 bool is_ekiga_net_book () const;
1853 --- ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp 2013-02-18 22:37:04.000000000 +0100
1854 +++ ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp.boost-signals2 2019-05-16 21:10:54.060889621 +0200
1858 public Ekiga::Service,
1859 - public boost::signals::trackable
1860 + public boost::signals2::trackable
1865 boost::shared_ptr<Ekiga::Call> call);
1866 void on_call_notification_closed (gpointer self);
1868 - typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type;
1869 + typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > container_type;
1870 container_type live;
1873 @@ -234,10 +234,10 @@
1874 notify_action_cb, notification.get (), NULL);
1876 g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ());
1877 - boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
1878 + boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
1879 this, notification));
1881 - live[notification] = std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
1882 + live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
1884 notify_notification_show (notif, NULL);
1886 --- ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h 2012-11-07 21:43:51.000000000 +0100
1887 +++ ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h.boost-signals2 2019-05-16 21:11:10.299929695 +0200
1890 xmlNodePtr get_node () const;
1892 - boost::signal0<void> trigger_saving;
1893 + boost::signals2::signal<void(void)> trigger_saving;
1895 const std::string get_name () const;
1897 --- ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h 2012-11-07 21:43:51.000000000 +0100
1898 +++ ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h.boost-signals2 2019-05-16 21:11:24.771965439 +0200
1901 public Ekiga::HeapImpl<Presentity>,
1903 - public boost::signals::trackable
1904 + public boost::signals2::trackable
1908 --- ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h 2012-11-07 21:43:51.000000000 +0100
1909 +++ ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h.boost-signals2 2019-05-16 21:11:41.572006967 +0200
1911 #define __LOUDMOUTH_HELPERS_H__
1913 #include <boost/smart_ptr.hpp>
1914 -#include <boost/signals.hpp>
1915 +#include <boost/signals2.hpp>
1917 #include <loudmouth/loudmouth.h>
1919 --- ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h 2012-11-07 21:43:51.000000000 +0100
1920 +++ ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h.boost-signals2 2019-05-16 21:11:53.612036752 +0200
1925 - boost::signal0<void> chat_requested;
1926 + boost::signals2::signal<void(void)> chat_requested;
1929 LmConnection* connection;
1930 --- ekiga-4.0.1/plugins/resource-list/rl-heap.cpp 2012-11-07 21:43:51.000000000 +0100
1931 +++ ekiga-4.0.1/plugins/resource-list/rl-heap.cpp.boost-signals2 2019-05-16 21:12:26.773118885 +0200
1936 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
1937 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
1938 iter = presentities.begin ();
1939 go_on && iter != presentities.end ();
1942 while ( !presentities.empty ()) {
1944 presentities.begin()->first->removed ();
1945 - for (std::list<boost::signals::connection>::const_iterator iter2
1946 + for (std::list<boost::signals2::connection>::const_iterator iter2
1947 = presentities.begin()->second.begin ();
1948 iter2 != presentities.begin()->second.end ();
1951 && xmlStrEqual (BAD_CAST ("entry"), child->name)) {
1953 PresentityPtr presentity(new Presentity (services, path, doc, child, writable));
1954 - std::list<boost::signals::connection> conns;
1955 + std::list<boost::signals2::connection> conns;
1956 conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity)));
1957 conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity)));
1958 conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this)));
1960 RL::Heap::push_presence (const std::string uri_,
1961 const std::string presence)
1963 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
1964 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
1965 iter = presentities.begin ();
1966 iter != presentities.end ();
1969 RL::Heap::push_status (const std::string uri_,
1970 const std::string status)
1972 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
1973 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
1974 iter = presentities.begin ();
1975 iter != presentities.end ();
1978 "contact on a remote server"));
1980 std::set<std::string> all_groups;
1981 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
1982 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
1983 iter = presentities.begin ();
1984 iter != presentities.end ();
1986 --- ekiga-4.0.1/plugins/resource-list/rl-heap.h 2012-11-07 21:43:51.000000000 +0100
1987 +++ ekiga-4.0.1/plugins/resource-list/rl-heap.h.boost-signals2 2019-05-16 21:12:47.397170040 +0200
1989 void push_status (const std::string uri,
1990 const std::string status);
1992 - boost::signal0<void> trigger_saving;
1993 + boost::signals2::signal<void(void)> trigger_saving;
1998 boost::shared_ptr<xmlDoc> doc;
1999 xmlNodePtr list_node;
2001 - std::map<PresentityPtr, std::list<boost::signals::connection> > presentities;
2002 + std::map<PresentityPtr, std::list<boost::signals2::connection> > presentities;
2006 --- ekiga-4.0.1/plugins/resource-list/rl-list.cpp 2012-11-07 21:43:51.000000000 +0100
2007 +++ ekiga-4.0.1/plugins/resource-list/rl-list.cpp.boost-signals2 2019-05-16 21:13:38.853297909 +0200
2010 void publish () const;
2012 - boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
2013 - boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
2014 - boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
2015 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
2016 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
2017 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
2020 /* data for its children */
2023 std::list<ChildType> ordering;
2024 std::list<boost::shared_ptr<List> > lists;
2025 - std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries;
2026 + std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries;
2030 @@ -235,12 +235,12 @@
2034 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin ();
2035 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin ();
2036 iter != entries.end ();
2039 iter->first->removed ();
2040 - for (std::list<boost::signals::connection>::iterator conn_iter
2041 + for (std::list<boost::signals2::connection>::iterator conn_iter
2042 = iter->second.begin ();
2043 conn_iter != iter->second.end ();
2045 @@ -342,10 +342,10 @@
2049 - std::list<boost::signals::connection> conns;
2050 + std::list<boost::signals2::connection> conns;
2051 conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry)));
2052 conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry)));
2053 - entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
2054 + entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (entry, conns));
2055 ordering.push_back (ENTRY);
2057 entry_added (entry);
2060 (*iter)->push_presence (uri_, presence);
2062 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2063 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2064 iter != entries.end ();
2069 (*iter)->push_status (uri_, status);
2071 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2072 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2073 iter != entries.end ();
2078 go_on = (*iter)->visit_presentities (visitor);
2080 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2081 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2082 go_on && iter != entries.end ();
2087 (*iter)->publish ();
2089 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2090 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2091 iter != entries.end ();
2094 --- ekiga-4.0.1/plugins/resource-list/rl-list.h 2012-11-07 21:43:51.000000000 +0100
2095 +++ ekiga-4.0.1/plugins/resource-list/rl-list.h.boost-signals2 2019-05-16 21:14:05.516364301 +0200
2098 void publish () const;
2100 - boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
2101 - boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
2102 - boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
2103 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
2104 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
2105 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
2107 /* this method orders the list to get rid of all its children */
2109 --- ekiga-4.0.1/plugins/resource-list/rl-presentity.h 2012-11-07 21:43:51.000000000 +0100
2110 +++ ekiga-4.0.1/plugins/resource-list/rl-presentity.h.boost-signals2 2019-05-16 21:14:16.140390781 +0200
2113 bool populate_menu (Ekiga::MenuBuilder &);
2115 - boost::signal0<void> trigger_reload;
2116 + boost::signals2::signal<void(void)> trigger_reload;
2120 --- ekiga-4.0.1/src/gui/assistant.cpp 2013-02-18 22:37:04.000000000 +0100
2121 +++ ekiga-4.0.1/src/gui/assistant.cpp.boost-signals2 2019-05-16 21:27:53.400468197 +0200
2123 gint last_active_page;
2125 GtkListStore *summary_model;
2126 - std::vector<boost::signals::connection> connections;
2127 + std::vector<boost::signals2::connection> connections;
2130 /* presenting the network connection type to the user */
2131 @@ -1679,7 +1679,7 @@
2132 g_signal_connect (assistant, "key-press-event",
2133 G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
2135 - boost::signals::connection conn;
2136 + boost::signals2::connection conn;
2137 assistant->priv->videoinput_core = service_core.get<Ekiga::VideoInputCore> ("videoinput-core");
2138 assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core");
2139 assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
2140 --- ekiga-4.0.1/src/gui/main_window.cpp 2013-02-18 22:36:51.000000000 +0100
2141 +++ ekiga-4.0.1/src/gui/main_window.cpp.boost-signals2 2019-05-16 21:27:43.064441457 +0200
2143 unsigned calling_state;
2145 gulong roster_selection_connection_id;
2146 - std::vector<boost::signals::connection> connections;
2147 + std::vector<boost::signals2::connection> connections;
2151 @@ -1706,7 +1706,7 @@
2153 ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
2155 - boost::signals::connection conn;
2156 + boost::signals2::connection conn;
2158 g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
2160 --- ekiga-4.0.1/src/gui/statusmenu.cpp 2013-02-18 22:37:04.000000000 +0100
2161 +++ ekiga-4.0.1/src/gui/statusmenu.cpp.boost-signals2 2019-05-16 21:27:34.032418100 +0200
2163 struct _StatusMenuPrivate
2165 boost::shared_ptr<Ekiga::PersonalDetails> personal_details;
2166 - std::vector<boost::signals::connection> connections;
2167 + std::vector<boost::signals2::connection> connections;
2169 GtkListStore *list_store; // List store storing the menu
2170 GtkWindow *parent; // Parent window
2173 StatusMenu *self = NULL;
2175 - boost::signals::connection conn;
2176 + boost::signals2::connection conn;
2177 GtkCellRenderer *renderer = NULL;
2178 GSList *custom_status_array [NUM_STATUS_TYPES];