[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sflphone-kde] src: [ #32016 ] Fix Ubuntu 12.04 issue
From:       Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date:       2013-10-18 19:24:05
Message-ID: E1VXFeX-0004cH-AA () scm ! kde ! org
[Download RAW message or body]

Git commit e544f000cd5d68b63709ab5e8165c7e2d5043f1f by Emmanuel Lepage Vallee.
Committed on 18/10/2013 at 19:23.
Pushed by lepagevalleeemmanuel into branch 'master'.

[ #32016 ] Fix Ubuntu 12.04 issue

M  +5    -0    src/CMakeLists.txt
M  +2    -1    src/conf/dlgaccounts.cpp

http://commits.kde.org/sflphone-kde/e544f000cd5d68b63709ab5e8165c7e2d5043f1f

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 212f4ed..f8af3ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,6 +44,11 @@ if (CMAKE_COMPILER_IS_GNUCC)
          -Wno-pragmas
          -Wno-error
       )
+
+      # 4.6 kdelibs versions compiled on Ubuntu 12.04 have issues with \
KUniqueApplication +      # disabling it  (((HACK)))
+      SET(DISABLE_UNIQUE_APPLICATION 1 CACHE BOOLEAN "Disable KUniqueApplication")
+      add_definitions( -DDISABLE_UNIQUE_APPLICATION=true )
    endif()
    if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
       ADD_DEFINITIONS(
diff --git a/src/conf/dlgaccounts.cpp b/src/conf/dlgaccounts.cpp
index 90ce6ef..8f4f2ce 100644
--- a/src/conf/dlgaccounts.cpp
+++ b/src/conf/dlgaccounts.cpp
@@ -265,12 +265,13 @@ void DlgAccounts::saveAccount(QModelIndex item)
    /**/account->setSipStunServer               ( line_stun->text()                   \
);  /**/account->setPublishedPort               ( spinBox_pa_published_port->value()  \
);  /**/account->setPublishedAddress            ( lineEdit_pa_published_address \
                ->text()                                   );
-   /**/account->setLocalPort                   ( spinBox_pa_published_port->value()  \
); +//    /**/account->setLocalPort                   ( \
spinBox_pa_published_port->value()                                       );  \
/**/account->setLocalInterface              ( \
comboBox_ni_local_address->currentText()                                 );  \
/**/account->setRingtoneEnabled             ( m_pEnableRingtoneGB->isChecked()        \
);  /**/account->setRingtonePath                ( m_pRingTonePath->url().path()       \
);  /**/account->setDTMFType                    ( \
m_pDTMFOverRTP->isChecked()?DtmfType::OverRtp:DtmfType::OverSip          );  \
/**/account->setAutoAnswer                  ( m_pAutoAnswer->isChecked()              \
); +   /**/account->setLocalPort                   ( spinBox_ni_local_port->value()   \
);  //                                                                                \
/  
 


[prev in list] [next in list] [prev in thread] [next in thread]