diff --git a/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h index 09ce93ea06fea5d5872d54ae7c95178ce2df086d..56a9d63a9cd75f59dedf60012f92f91f0ef79b7c 100644 --- a/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h @@ -27,7 +27,7 @@ */ /* Machine name, filled in by autoconf script */ -#define PJ_M_NAME "i686" +#define PJ_M_NAME "x86_64" /* Endianness, as detected by autoconf */ /* #undef WORDS_BIGENDIAN */ diff --git a/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h index a2063c67dca115b6a61f3fcd1d1af27f00d85663..1d69febf20ff5dcf5a84f30e1320d1141f721c0f 100644 --- a/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h @@ -28,7 +28,7 @@ */ /* Canonical OS name */ -#define PJ_OS_NAME "i686-pc-linux-gnu" +#define PJ_OS_NAME "x86_64-unknown-linux-gnu" /* Legacy macros */ /* #undef PJ_WIN32 */ @@ -162,7 +162,7 @@ #define PJ_NATIVE_STRING_IS_UNICODE 0 /* Pool alignment in bytes */ -#define PJ_POOL_ALIGNMENT 4 +#define PJ_POOL_ALIGNMENT 8 /* The type of atomic variable value: */ #define PJ_ATOMIC_VALUE_TYPE long diff --git a/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h index ff184d20d616b16ad37f2b09f6d43c1ac2b9f35b..a2c22b28d8492be01c592d6d5e760d651efd1987 100644 --- a/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h @@ -32,7 +32,7 @@ * But only do this if user doesn't explicitly configure in pj/config_site.h. */ #ifndef PJSIP_HAS_TLS_TRANSPORT -/* #undef PJSIP_HAS_TLS_TRANSPORT */ +#define PJSIP_HAS_TLS_TRANSPORT 1 #endif diff --git a/sflphone_kde/sflphone_kde.kdevelop.pcs b/sflphone_kde/sflphone_kde.kdevelop.pcs index 23d120e136680806a2b15b14ee4706f4602a8237..19c8c9a9535818c626f537ad1a52607169ede3de 100644 Binary files a/sflphone_kde/sflphone_kde.kdevelop.pcs and b/sflphone_kde/sflphone_kde.kdevelop.pcs differ diff --git a/sflphone_kde/sflphone_kde.kdevses b/sflphone_kde/sflphone_kde.kdevses index 33f9b6747236cd25131b4b54520fa05d12887034..bd9758e3697f34daeaafcacc3b4136faa8f3eef7 100644 --- a/sflphone_kde/sflphone_kde.kdevses +++ b/sflphone_kde/sflphone_kde.kdevses @@ -1,67 +1,34 @@ <?xml version = '1.0' encoding = 'UTF-8'?> <!DOCTYPE KDevPrjSession> <KDevPrjSession> - <DocsAndViews NumberOfDocuments="20" > - <Doc0 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/AccountList.h" > - <View0 Encoding="" line="0" Type="Source" /> + <DocsAndViews NumberOfDocuments="9" > + <Doc0 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/ConfigDialog.cpp" > + <View0 Encoding="" Type="Source" /> </Doc0> - <Doc1 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/callmanager-introspec.xml" > - <View0 Encoding="" line="44" Type="Source" /> + <Doc1 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/SFLPhone.cpp" > + <View0 Encoding="" line="229" Type="Source" /> </Doc1> - <Doc2 NumberOfViews="1" URL="file:///home/jquentin/sflphone/src/dbus/callmanager-introspec.xml" > - <View0 Encoding="" line="91" Type="Source" /> + <Doc2 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.cpp" > + <View0 Encoding="" Type="Source" /> </Doc2> - <Doc3 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/callmanager_interface_p.h" > - <View0 Encoding="" line="0" Type="Source" /> + <Doc3 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.h" > + <View0 Encoding="" Type="Source" /> </Doc3> - <Doc4 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.cpp" > - <View0 Encoding="" line="251" Type="Source" /> + <Doc4 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/sflphone_const.h" > + <View0 Encoding="" Type="Source" /> </Doc4> <Doc5 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/SFLPhone.h" > - <View0 Encoding="" line="89" Type="Source" /> + <View0 Encoding="" Type="Source" /> </Doc5> - <Doc6 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/SFLPhone.cpp" > - <View0 Encoding="" line="695" Type="Source" /> + <Doc6 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/configurationmanager_interface_singleton.cpp" > + <View0 Encoding="" Type="Source" /> </Doc6> - <Doc7 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.h" > - <View0 Encoding="" line="56" Type="Source" /> + <Doc7 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Account.cpp" > + <View0 Encoding="" line="90" Type="Source" /> </Doc7> - <Doc8 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/sflphone_const.h" > - <View0 Encoding="" line="77" Type="Source" /> + <Doc8 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/sflphone_kdeui.rc" > + <View0 Encoding="" line="8" Type="Source" /> </Doc8> - <Doc9 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/CallList.h" > - <View0 Encoding="" line="18" Type="Source" /> - </Doc9> - <Doc10 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/CallList.cpp" > - <View0 Encoding="" line="34" Type="Source" /> - </Doc10> - <Doc11 NumberOfViews="1" URL="file:///home/jquentin/sflphone/src/managerimpl.cpp" > - <View0 Encoding="" line="444" Type="Source" /> - </Doc11> - <Doc12 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/callmanager_interface_singleton.h" > - <View0 Encoding="" line="19" Type="Source" /> - </Doc12> - <Doc13 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/ConfigDialog.h" > - <View0 Encoding="" line="43" Type="Source" /> - </Doc13> - <Doc14 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/ConfigDialog.cpp" > - <View0 Encoding="" line="412" Type="Source" /> - </Doc14> - <Doc15 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/callmanager_interface_singleton.cpp" > - <View0 Encoding="" line="11" Type="Source" /> - </Doc15> - <Doc16 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/main.cpp" > - <View0 Encoding="" line="24" Type="Source" /> - </Doc16> - <Doc17 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/configurationmanager-introspec.xml" > - <View0 Encoding="" line="5" Type="Source" /> - </Doc17> - <Doc18 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/AccountList.cpp" > - <View0 Encoding="" line="15" Type="Source" /> - </Doc18> - <Doc19 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Account.cpp" > - <View0 Encoding="" line="64" Type="Source" /> - </Doc19> </DocsAndViews> <pluginList> <kdevdebugger>