-
Notifications
You must be signed in to change notification settings - Fork 9
/
boost-signals2.patch
2179 lines (1797 loc) · 91.3 KB
/
boost-signals2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Patch by Robert Scheck <[email protected]> for Ekiga 4.0.1, which backports
the following upstream commits (with some minor downstream-only changes to get the
Ekiga building) for Boost.Signals2 support:
- https://github.com/GNOME/ekiga/commit/12641b735a9886a080949465d4da6d4569822ed2
- https://github.com/GNOME/ekiga/commit/44ef7c66d055d01bede6627a8b31e4135f54f807
- https://github.com/GNOME/ekiga/commit/95e2daa3953355118abec5a30fb2642a105705b2
- https://github.com/GNOME/ekiga/commit/aabf103dcf7f0e61ed1903bc4f37f1dd549fb2ef
- https://github.com/GNOME/ekiga/commit/b8ea1fe8c15a4fa6a8bfde5e8b51febc74f8e529
This backport makes sense, because unfortunately upstream didn't release anything
after Ekiga 4.0.1, while 8c954b8ab3a771900f125375ba652afaf1966d19 just immediately
ends with a segmentation fault (which is the latest Git commit as of writing). And
openSUSE uses 8c954b8ab3a771900f125375ba652afaf1966d19 from a few months after the
Ekiga 4.0.1 release, but with Boost.Signals2 support. While this Git commit leads
even to a starting Ekiga, a not picked up inbound ringing phone call leads sooner
or later to a segmentation fault (the caller needs to hit the correct point before
hanging up and it thus takes sometimes 2-3 tries until it crashes). Aside of that,
there are graphical glitches in the popup/dialog when actually having a call. And
finally quitting Ekiga sometimes also ends with yet another segmentation fault...
While I fortunately didn't see any of the above mentioned issues with Ekiga 4.0.1
and this Boost.Signals2 backport patch, any before existing old Ekiga 4.0.1 issues
will exist further on for sure...
--- ekiga-4.0.1/configure.ac 2019-05-16 20:32:30.610373983 +0200
+++ ekiga-4.0.1/configure.ac.boost-signals2 2019-05-16 22:11:08.958062692 +0200
@@ -173,15 +173,16 @@
dnl ###############################
dnl Mandatory BOOST support
dnl ###############################
-AX_BOOST_BASE([1.34])
-AX_BOOST_SIGNALS
+AX_BOOST_BASE([1.53])
-if test "x${ax_cv_boost_signals}" == "xno"; then
- AC_MSG_ERROR([You need the boost signals library to compile Ekiga])
-fi
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no)
+CPPFLAGS="$CPPFLAGS_save"
-BOOST_LIBS="${BOOST_SIGNALS_LIB}"
-AC_SUBST(BOOST_LIBS)
+if test "x$found_signals2" = "xno"; then
+ AC_MSG_ERROR([Could not find BOOST signals2 headers])
+fi
dnl ###############################
@@ -722,6 +723,13 @@
AC_MSG_ERROR([You need ptlib expat support to compile ekiga])
fi
+# Make sure ptlib and opal don't force no-exceptions,
+# as we need them for boost's signals2
+PTLIB_CFLAGS="$PTLIB_CFLAGS -fexceptions"
+AC_SUBST(PTLIB_CFLAGS)
+OPAL_CFLAGS="$OPAL_CFLAGS -fexceptions"
+AC_SUBST(OPAL_CFLAGS)
+
SUFFIX=
AC_ARG_ENABLE([opal-debug],
[AS_HELP_STRING([--enable-opal-debug],[link to debug versions of opal and ptlib (opal_d and ptlib_d) (default is disabled)])],
--- ekiga-4.0.1/lib/engine/account/account-core.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/account/account-core.h.boost-signals2 2019-05-16 20:34:25.949622624 +0200
@@ -106,26 +106,26 @@
/** This signal is emitted when a bank has been added to the core
*/
- boost::signal1<void, BankPtr> bank_added;
+ boost::signals2::signal<void(BankPtr)> bank_added;
/** This signal is emitted when a bank has been removed from the core
*/
- boost::signal1<void, BankPtr> bank_removed;
+ boost::signals2::signal<void(BankPtr)> bank_removed;
/** This signal is emitted when a account has been added to one of
* the banks
*/
- boost::signal2<void, BankPtr, AccountPtr> account_added;
+ boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
/** This signal is emitted when a account has been removed from one of
* the banks
*/
- boost::signal2<void, BankPtr, AccountPtr> account_removed;
+ boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
/** This signal is emitted when a account has been updated in one of
* the banks
*/
- boost::signal2<void, BankPtr, AccountPtr> account_updated;
+ boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
private:
@@ -147,7 +147,7 @@
/** This signal is emitted when the AccountCore Service has been
* updated.
*/
- boost::signal0<void> updated;
+ boost::signals2::signal<void(void)> updated;
/** This chain allows the AccountCore to present forms to the user
--- ekiga-4.0.1/lib/engine/account/bank.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/account/bank.h.boost-signals2 2019-05-16 20:35:52.157810900 +0200
@@ -74,15 +74,15 @@
/** This signal is emitted when a account has been added.
*/
- boost::signal1<void, AccountPtr> account_added;
+ boost::signals2::signal<void(AccountPtr)> account_added;
/** This signal is emitted when a account has been removed.
*/
- boost::signal1<void, AccountPtr> account_removed;
+ boost::signals2::signal<void(AccountPtr)> account_removed;
/** This signal is emitted when a account has been updated.
*/
- boost::signal1<void, AccountPtr> account_updated;
+ boost::signals2::signal<void(AccountPtr)> account_updated;
/** This chain allows the BankImpl to present forms to the user
*/
--- ekiga-4.0.1/lib/engine/account/bank-impl.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/account/bank-impl.h.boost-signals2 2019-05-16 20:34:41.093655548 +0200
@@ -74,7 +74,7 @@
template<class AccountType = Account>
class BankImpl:
public Bank,
- public boost::signals::trackable,
+ public boost::signals2::trackable,
protected RefLister<AccountType>
{
--- ekiga-4.0.1/lib/engine/addressbook/book.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/addressbook/book.h.boost-signals2 2019-05-16 20:36:30.212894662 +0200
@@ -92,17 +92,17 @@
/** This signal is emitted when a Contact has been added to the Book.
*/
- boost::signal1<void, ContactPtr > contact_added;
+ boost::signals2::signal<void(ContactPtr)> contact_added;
/** This signal is emitted when a Contact has been removed from the Book.
*/
- boost::signal1<void, ContactPtr > contact_removed;
+ boost::signals2::signal<void(ContactPtr)> contact_removed;
/** This signal is emitted when a Contact has been updated in the Book.
*/
- boost::signal1<void, ContactPtr > contact_updated;
+ boost::signals2::signal<void(ContactPtr)> contact_updated;
};
typedef boost::shared_ptr<Book> BookPtr;
--- ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp.boost-signals2 2019-05-16 21:26:27.190245510 +0200
@@ -50,7 +50,7 @@
Ekiga::ContactCore::~ContactCore ()
{
- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
+ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
iter->disconnect ();
}
--- ekiga-4.0.1/lib/engine/addressbook/contact-core.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/addressbook/contact-core.h.boost-signals2 2019-05-16 21:26:20.542228371 +0200
@@ -118,37 +118,37 @@
/** This signal is emitted when a Ekiga::Source has been
* added to the ContactCore Service.
*/
- boost::signal1<void, SourcePtr > source_added;
+ boost::signals2::signal<void(SourcePtr)> source_added;
/** This signal is emitted when a book has been added to one of
* the sources
*/
- boost::signal2<void, SourcePtr, BookPtr > book_added;
+ boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
/** This signal is emitted when a book has been removed from one of
* the sources
*/
- boost::signal2<void, SourcePtr, BookPtr > book_removed;
+ boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
/** This signal is emitted when a book has been updated in one of
* the sources
*/
- boost::signal2<void, SourcePtr, BookPtr > book_updated;
+ boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
/** This signal is emitted when a contact has been added to one of
* the book of one of the sources
*/
- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
+ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
/** This signal is emitted when a contact has been removed from one of
* the book of one of the sources
*/
- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
+ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
/** This signal is emitted when a contact has been updated in one of
* the book of one of the sources
*/
- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
+ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
private:
@@ -174,7 +174,7 @@
std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
/*** Misc stuff ***/
- std::list<boost::signals::connection> conns;
+ std::list<boost::signals2::connection> conns;
};
/**
--- ekiga-4.0.1/lib/engine/addressbook/source.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/addressbook/source.h.boost-signals2 2019-05-16 20:38:37.038176631 +0200
@@ -63,32 +63,32 @@
/** This signal is emitted when a Book has been added to the Source.
*/
- boost::signal1<void, BookPtr > book_added;
+ boost::signals2::signal<void(BookPtr)> book_added;
/** This signal is emitted when a Book has been updated in the Source.
*/
- boost::signal1<void, BookPtr > book_updated;
+ boost::signals2::signal<void(BookPtr)> book_updated;
/** This signal is emitted when a Book has been removed in the Source.
*/
- boost::signal1<void, BookPtr > book_removed;
+ boost::signals2::signal<void(BookPtr)> book_removed;
/** This signal is emitted when a Contact has been added to a book in
* this source.
*/
- boost::signal2<void, BookPtr, ContactPtr > contact_added;
+ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
/** This signal is emitted when a Contact has been removed from a book in
* this source.
*/
- boost::signal2<void, BookPtr, ContactPtr > contact_removed;
+ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
/** This signal is emitted when a Contact has been updated in a book in
* this source
*/
- boost::signal2<void, BookPtr, ContactPtr > contact_updated;
+ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
};
typedef boost::shared_ptr<Source> SourcePtr;
--- ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h.boost-signals2 2019-05-16 20:39:25.511285526 +0200
@@ -136,7 +136,7 @@
/** This signal is emitted when a Ekiga::AudioInputManager has been
* added to the AudioInputCore Service.
*/
- boost::signal1<void, AudioInputManager &> manager_added;
+ boost::signals2::signal<void(AudioInputManager &)> manager_added;
/*** AudioInput Device Management ***/
@@ -254,23 +254,23 @@
/** See audioinput-manager.h for the API
*/
- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
- boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
+ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
+ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
+ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error;
/** This signal is emitted when an audio device input has been added to the system.
* This signal will be emitted if add_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio input device that was added.
*/
- boost::signal2<void, AudioInputDevice, bool> device_added;
+ boost::signals2::signal<void(AudioInputDevice, bool)> device_added;
/** This signal is emitted when an audio input device has been removed from the system.
* This signal will be emitted if remove_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio input device that was removed.
*/
- boost::signal2<void, AudioInputDevice, bool> device_removed;
+ boost::signals2::signal<void(AudioInputDevice, bool)> device_removed;
private:
void on_set_device (const AudioInputDevice & device);
--- ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h.boost-signals2 2019-05-16 20:40:06.093377163 +0200
@@ -39,7 +39,7 @@
#define __AUDIOINPUT_MANAGER_H__
#include <vector>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "audioinput-info.h"
@@ -148,18 +148,18 @@
* @param device the audio input device that was opened.
* @param config the current audio input device configuration (current volume, etc.).
*/
- boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
+ boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
/** This signal is emitted when an audio input device is closed.
* @param device the audio input device that was closed.
*/
- boost::signal1<void, AudioInputDevice> device_closed;
+ boost::signals2::signal<void(AudioInputDevice)> device_closed;
/** This signal is emitted when an error occurs when opening a audio input device.
* @param device the audio input device that caused the error.
* @param error_code the audio input device error code.
*/
- boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
+ boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
protected:
--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h 2013-02-18 22:37:04.000000000 +0100
+++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h.boost-signals2 2019-05-16 20:40:58.822496863 +0200
@@ -128,7 +128,7 @@
/** This signal is emitted when a Ekiga::AudioOutputManager has been
* added to the AudioOutputCore Service.
*/
- boost::signal1<void, AudioOutputManager &> manager_added;
+ boost::signals2::signal<void(AudioOutputManager &)> manager_added;
/** Get a list of all devices supported by all managers registered to the core.
@@ -299,23 +299,23 @@
/** See audiooutput-manager.h for the API
*/
- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
- boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
+ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
+ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
+ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error;
/** This signal is emitted when an audio output device has been added to the system.
* This signal will be emitted if add_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio output device that was added.
*/
- boost::signal2<void, AudioOutputDevice, bool> device_added;
+ boost::signals2::signal<void(AudioOutputDevice, bool)> device_added;
/** This signal is emitted when an audio output device has been removed from the system.
* This signal will be emitted if remove_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio output device that was removed.
*/
- boost::signal2<void, AudioOutputDevice, bool> device_removed;
+ boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed;
private:
void on_set_device (const AudioOutputDevice & device);
--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h.boost-signals2 2019-05-16 20:41:41.638594580 +0200
@@ -39,7 +39,7 @@
#define __AUDIOOUTPUT_MANAGER_H__
#include <vector>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "audiooutput-info.h"
@@ -152,20 +152,20 @@
* @param device the audio output device that was opened.
* @param config the current audio output device configuration (current volume, etc.).
*/
- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
/** This signal is emitted when an audio output device is closed.
* @param prim whether the primary or secondary audio output device was closed.
* @param device the audio output device that was closed.
*/
- boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
/** This signal is emitted when an error occurs when opening an audio output device.
* @param prim whether the primary or secondary audio output device caused the error.
* @param device the audio output device that caused the error.
* @param error_code the audio output device error code.
*/
- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
protected:
typedef struct ManagerState {
--- ekiga-4.0.1/lib/engine/chat/chat-core.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/chat/chat-core.h.boost-signals2 2019-05-16 20:42:03.614644914 +0200
@@ -100,7 +100,7 @@
/** This signal is emitted when an Ekiga::Dialect has been added to
* the ChatCore service.
*/
- boost::signal1<void, DialectPtr > dialect_added;
+ boost::signals2::signal<void(DialectPtr)> dialect_added;
private:
@@ -116,7 +116,7 @@
/** This signal is emitted when the ChatCore service has been updated.
*/
- boost::signal0<void> updated;
+ boost::signals2::signal<void(void)> updated;
/** This chain allows the ChatCore to present forms to the user
*/
--- ekiga-4.0.1/lib/engine/chat/chat.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/chat/chat.h.boost-signals2 2019-05-16 20:42:45.038740118 +0200
@@ -37,7 +37,7 @@
#define __CHAT_H__
#include <string>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <boost/smart_ptr.hpp>
@@ -113,15 +113,15 @@
/** This signal is emitted when the Chat has been updated.
*/
- boost::signal0<void> updated;
+ boost::signals2::signal<void(void)> updated;
/** This signal is emitted when the user requested to see this Chat
*/
- boost::signal0<void> user_requested;
+ boost::signals2::signal<void(void)> user_requested;
/** This signal is emitted when the Chat has been removed.
*/
- boost::signal0<void> removed;
+ boost::signals2::signal<void(void)> removed;
/** Feed possible actions on this Chat to the given MenuBuilder
* @param A MenuBuilder object to populate.
--- ekiga-4.0.1/lib/engine/chat/dialect.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/chat/dialect.h.boost-signals2 2019-05-16 20:43:23.359828571 +0200
@@ -72,12 +72,12 @@
/** This signal is emitted when an Ekiga::SimpleChat has been added to
* the dialect.
*/
- boost::signal1<void, SimpleChatPtr> simple_chat_added;
+ boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
/** This signal is emitted when an Ekiga::MultipleChat has been added to
* the dialect.
*/
- boost::signal1<void, MultipleChatPtr> multiple_chat_added;
+ boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added;
/** This chain allows the Dialect to present forms to the user.
*/
--- ekiga-4.0.1/lib/engine/chat/dialect-impl.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/chat/dialect-impl.h.boost-signals2 2019-05-16 21:27:11.112358866 +0200
@@ -47,7 +47,7 @@
typename MultipleChatType = MultipleChat>
class DialectImpl:
public Dialect,
- public boost::signals::trackable
+ public boost::signals2::trackable
{
public:
@@ -75,10 +75,10 @@
/* More STL-like ways to access the chats within this Ekiga::DialectImpl
*/
- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
+ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
+ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
+ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
+ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
simple_iterator simple_begin ();
simple_iterator simple_end ();
@@ -116,8 +116,8 @@
private:
- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
+ std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
+ std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
@@ -133,22 +133,22 @@
template<typename SimpleChatType, typename MultipleChatType>
Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
{
- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
+ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
iter != simple_chats.end ();
iter++) {
- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
+ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
conn_iter != iter->second.end ();
++conn_iter) {
conn_iter->disconnect ();
}
}
- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
+ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
iter != multiple_chats.end ();
iter++) {
- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
+ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
conn_iter != iter->second.end ();
++conn_iter) {
@@ -163,7 +163,7 @@
{
bool go_on = true;
- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
+ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin ();
go_on && iter != simple_chats.end ();
iter++) {
@@ -177,7 +177,7 @@
{
bool go_on = true;
- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
+ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
go_on && iter != multiple_chats.end ();
iter++) {
@@ -275,7 +275,7 @@
void
Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
{
- for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
+ for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
iter != simple_chats[chat].end ();
++iter) {
@@ -288,7 +288,7 @@
void
Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
{
- for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
+ for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin ();
iter != multiple_chats[chat].end ();
++iter) {
--- ekiga-4.0.1/lib/engine/components/call-history/history-book.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/call-history/history-book.h.boost-signals2 2019-05-16 20:43:58.286909503 +0200
@@ -53,7 +53,7 @@
class Book:
public Ekiga::Book,
- public boost::signals::trackable
+ public boost::signals2::trackable
{
public:
@@ -86,7 +86,7 @@
void clear ();
- boost::signal0<void> cleared;
+ boost::signals2::signal<void(void)> cleared;
private:
--- ekiga-4.0.1/lib/engine/components/call-history/history-contact.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/call-history/history-contact.h.boost-signals2 2019-05-16 20:44:24.678970855 +0200
@@ -61,7 +61,7 @@
class Contact:
public Ekiga::Contact,
- public boost::signals::trackable
+ public boost::signals2::trackable
{
public:
--- ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h.boost-signals2 2019-05-16 20:45:18.111095580 +0200
@@ -51,7 +51,7 @@
class Cluster :
public Ekiga::ClusterImpl<Heap>,
public Ekiga::Trigger,
- public boost::signals::trackable
+ public boost::signals2::trackable
{
public:
--- ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h.boost-signals2 2019-05-16 20:45:33.511131655 +0200
@@ -162,7 +162,7 @@
* This signal makes the Local::Heap know that the XML tree changed
* and hence should be saved
*/
- boost::signal0<void> trigger_saving;
+ boost::signals2::signal<void(void)> trigger_saving;
private:
--- ekiga-4.0.1/lib/engine/components/opal/opal-account.h 2013-02-18 22:37:04.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/opal/opal-account.h.boost-signals2 2019-05-16 20:45:50.751172106 +0200
@@ -153,7 +153,7 @@
const std::string as_string () const;
- boost::signal0<void> trigger_saving;
+ boost::signals2::signal<void(void)> trigger_saving;
/*
* This is because an opal account is an Ekiga::PresencePublisher
--- ekiga-4.0.1/lib/engine/components/opal/opal-call.h 2013-02-18 22:37:04.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/opal/opal-call.h.boost-signals2 2019-05-16 20:46:08.255213249 +0200
@@ -55,7 +55,7 @@
class Call
: public OpalCall,
public Ekiga::Call,
- public boost::signals::trackable
+ public boost::signals2::trackable
{
public:
--- ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp.boost-signals2 2019-05-16 20:46:26.119255313 +0200
@@ -35,7 +35,7 @@
*/
#include <iostream>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "config.h"
--- ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h.boost-signals2 2019-05-16 21:15:28.782572221 +0200
@@ -36,7 +36,7 @@
#ifndef __CHAIN_OF_RESPONSIBILITY_H__
#define __CHAIN_OF_RESPONSIBILITY_H__
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
/* This code uses boost signals to implement the "chain of responsibility"
@@ -117,9 +117,8 @@
template<typename T_request>
struct ChainOfResponsibility:
- public boost::signal1<bool,
- T_request,
- responsibility_accumulator>
+ public boost::signals2::signal<bool(T_request),
+ responsibility_accumulator>
{
};
};
--- ekiga-4.0.1/lib/engine/framework/form-request-simple.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/form-request-simple.h.boost-signals2 2019-05-16 20:48:12.632507659 +0200
@@ -36,7 +36,7 @@
#ifndef __FORM_REQUEST_SIMPLE_H__
#define __FORM_REQUEST_SIMPLE_H__
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "form-builder.h"
--- ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h.boost-signals2 2019-05-16 20:48:33.432557242 +0200
@@ -38,7 +38,7 @@
#define __GMCONF_BRIDGE_H__
#include <vector>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "gmconf.h"
@@ -94,7 +94,7 @@
* @param key is the GmConf key whose value changed
* @param entry is the new GmConf entry
*/
- boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
+ boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed;
protected :
Ekiga::Service & service;
--- ekiga-4.0.1/lib/engine/framework/live-object.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/live-object.h.boost-signals2 2019-05-16 20:48:53.280604647 +0200
@@ -62,12 +62,12 @@
/** This signal is emitted when the object has been updated.
*/
- boost::signal0<void> updated;
+ boost::signals2::signal<void(void)> updated;
/** This signal is emitted when the object has been removed.
*/
- boost::signal0<void> removed;
+ boost::signals2::signal<void(void)> removed;
/** This chain allows the object to present forms to the user
*/
--- ekiga-4.0.1/lib/engine/framework/menu-builder.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/menu-builder.h.boost-signals2 2019-05-16 20:49:09.399643212 +0200
@@ -37,7 +37,7 @@
#define __MENU_BUILDER_H__
#include <string>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
--- ekiga-4.0.1/lib/engine/framework/personal-details.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/personal-details.h.boost-signals2 2019-05-16 20:49:31.152695349 +0200
@@ -37,7 +37,7 @@
#define __PERSONAL_DETAILS_H__
#include <string>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include "services.h"
@@ -66,7 +66,7 @@
virtual void set_presence_info (const std::string presence,
const std::string status) = 0;
- boost::signal0<void> updated;
+ boost::signals2::signal<void(void)> updated;
};
};
--- ekiga-4.0.1/lib/engine/framework/reflister.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/reflister.h.boost-signals2 2019-05-16 20:50:53.592893897 +0200
@@ -37,7 +37,7 @@
#ifndef __REFLISTER_H__
#define __REFLISTER_H__
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#include <list>
@@ -55,7 +55,7 @@
{
protected:
- typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
+ typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
typedef Ekiga::map_key_iterator<container_type> iterator;
typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
@@ -66,7 +66,7 @@
void add_object (boost::shared_ptr<ObjectType> obj);
void add_connection (boost::shared_ptr<ObjectType> obj,
- boost::signals::connection connection);
+ boost::signals2::connection connection);
void remove_object (boost::shared_ptr<ObjectType> obj);
@@ -78,9 +78,9 @@
const_iterator begin () const;
const_iterator end () const;
- boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
- boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
- boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
+ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
+ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
+ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
private:
container_type objects;
@@ -95,7 +95,7 @@
iter != objects.end ();
++iter) {
- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
+ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
conn_iter != iter->second.end ();
++conn_iter) {
@@ -130,7 +130,7 @@
template<typename ObjectType>
void
Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
- boost::signals::connection connection)
+ boost::signals2::connection connection)
{
objects[obj].push_back (connection);
}
@@ -139,8 +139,8 @@
void
Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
{
- std::list<boost::signals::connection> connections = objects[obj];
- for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
+ std::list<boost::signals2::connection> connections = objects[obj];
+ for (std::list<boost::signals2::connection>::iterator iter = connections.begin ();
iter != connections.end ();
++iter)
iter->disconnect ();
--- ekiga-4.0.1/lib/engine/framework/runtime.h 2012-11-07 21:43:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/runtime.h.boost-signals2 2019-05-16 21:15:48.437621428 +0200
@@ -34,7 +34,7 @@
*
*/
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
#ifndef __RUNTIME_H__
--- ekiga-4.0.1/lib/engine/framework/services.h 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/framework/services.h.boost-signals2 2019-05-16 20:51:40.904008518 +0200
@@ -45,7 +45,7 @@
#include <list>
#include <string>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
#include <boost/bind.hpp>
namespace Ekiga
@@ -101,7 +101,7 @@
void dump (std::ostream &stream) const;
- boost::signal1<void, ServicePtr> service_added;
+ boost::signals2::signal<void(ServicePtr)> service_added;
private:
--- ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp 2013-02-18 22:37:04.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp.boost-signals2 2019-05-16 20:52:02.689061460 +0200
@@ -38,6 +38,8 @@
#include "config.h"
#include "codecsbox.h"
+#include <sstream>
+
#include "gmconf.h"
#include "codec-description.h"
--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp.boost-signals2 2019-05-16 20:52:22.872110600 +0200
@@ -62,7 +62,7 @@
GtkAccelGroup *accel;
Ekiga::ServiceCore &core;
- std::vector<boost::signals::connection> connections;
+ std::vector<boost::signals2::connection> connections;
std::string presence;
@@ -502,7 +502,7 @@
{
AccountsWindow *self = ACCOUNTS_WINDOW (obj);
- for (std::vector<boost::signals::connection>::iterator iter
+ for (std::vector<boost::signals2::connection>::iterator iter
= self->priv->connections.begin ();
iter != self->priv->connections.end ();
iter++)
@@ -535,7 +535,7 @@
{
AccountsWindow *self = NULL;
- boost::signals::connection conn;
+ boost::signals2::connection conn;
GtkWidget *vbox = NULL;
GtkWidget *menu_bar = NULL;
--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp.boost-signals2 2019-05-16 20:52:40.184152821 +0200
@@ -52,7 +52,7 @@
_AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { }
Ekiga::ContactCore & core;
- std::vector<boost::signals::connection> connections;
+ std::vector<boost::signals2::connection> connections;
GtkWidget *tree_view;
GtkWidget *notebook;
GtkTreeSelection *selection;
@@ -579,7 +579,7 @@
{
AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
- for (std::vector<boost::signals::connection>::iterator iter
+ for (std::vector<boost::signals2::connection>::iterator iter
= self->priv->connections.begin ();
iter != self->priv->connections.end ();
iter++)
@@ -613,7 +613,7 @@
{
AddressBookWindow *self = NULL;
- boost::signals::connection conn;
+ boost::signals2::connection conn;
GtkWidget *menu_bar = NULL;
GtkWidget *frame = NULL;
--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp.boost-signals2 2019-05-16 21:25:50.824151811 +0200
@@ -62,7 +62,7 @@
GtkWidget *scrolled_window;
Ekiga::BookPtr book;
- std::list<boost::signals::connection> connections;
+ std::list<boost::signals2::connection> connections;
};
@@ -447,7 +447,7 @@
view = BOOK_VIEW_GTK (obj);
- for (std::list<boost::signals::connection>::iterator iter
+ for (std::list<boost::signals2::connection>::iterator iter
= view->priv->connections.begin ();
iter != view->priv->connections.end ();
++iter)
--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.boost-signals2 2019-05-16 20:53:08.385221735 +0200
@@ -56,7 +56,7 @@
boost::shared_ptr<History::Book> book;
GtkListStore* store;
GtkTreeView* tree;
- std::vector<boost::signals::connection> connections;
+ std::vector<boost::signals2::connection> connections;
};
/* this is what we put in the view */
@@ -229,7 +229,7 @@
view = CALL_HISTORY_VIEW_GTK (obj);
- for (std::vector<boost::signals::connection>::iterator iter
+ for (std::vector<boost::signals2::connection>::iterator iter
= view->priv->connections.begin ();
iter != view->priv->connections.end ();
iter++)
@@ -314,7 +314,7 @@
GtkCellRenderer *renderer = NULL;
GtkTreeSelection *selection = NULL;
- boost::signals::connection conn;
+ boost::signals2::connection conn;
g_return_val_if_fail (book, (GtkWidget*)NULL);
--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp 2013-02-18 22:37:04.000000000 +0100
+++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp.boost-signals2 2019-05-16 20:53:23.457258635 +0200
@@ -181,7 +181,7 @@
GtkWidget *transfer_call_popup;