Merge branch 'master' into m_savard

configure.ac

@@ -150,6 +150,12 @@ if test "x${have_libpj}" = "xfalse" ; then
 fi
 AC_SUBST(SIP_CFLAGS)
 
+dnl Check for uuid development package - name: uuid-dev 
+UUID_MIN_VERSION=1.0
+PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
+AC_SUBST(UUID_CFLAGS)
+AC_SUBST(UUID_LIBS)
+
 dnl Check for alsa development package - name: libasound2-dev 
 LIBASOUND2_MIN_VERSION=1.0
 PKG_CHECK_MODULES(ALSA, alsa >= ${LIBASOUND2_MIN_VERSION})
@@ -188,18 +194,11 @@ PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION})
 AC_SUBST(DBUSCPP_LIBS)
 AC_SUBST(DBUSCPP_CFLAGS)
 
-LIBOPENSSL_MIN_VERSION=0.9.8
-PKG_CHECK_MODULES(LIBOPENSSL, libssl >= ${LIBOPENSSL_MIN_VERSION})
-AC_SUBST(LIBOPENSSL_LIBS)
-AC_SUBST(LIBOPENSSL_CFLAGS)
-
 dnl Check for libcppunit-dev
 CPPUNIT_MIN_VERSION=1.12
 PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
 AC_SUBST(CPPUNIT_LIBS)
 
-LIBSSL_MIN_VERSION=0.9.8
-
 # check for libgsm1 (doesn't use pkg-config)
 dnl Check for libgsm
 AC_ARG_WITH([gsm],

debian/control.intrepid

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
+Build-Depends: debhelper (>= 5), autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
 Standards-Version: 3.8.0
 
 Package: sflphone

debian/control.jaunty

@@ -2,7 +2,7 @@ Source: sflphone
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
+Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
 Standards-Version: 3.7.3
 
 Package: sflphone

po/fr.po

@@ -45,7 +45,7 @@ msgstr "Réseau non trouvé"
 
 #: ../sflphone-gtk/src/accountlist.c:176
 msgid "Host unreachable"
-msgstr "_Serveur introuvable"
+msgstr "Serveur introuvable"
 
 #: ../sflphone-gtk/src/accountlist.c:179
 msgid "Stun configuration error"

sflphone-gtk/src/configwindow.c

@@ -479,7 +479,7 @@ void update_registration( void )
 GtkWidget* create_stun_tab()
 {
     GtkWidget * tableNat;
-    gchar * stun_server= "stun.fwdnet.net:3478";
+    gchar * stun_server= "stun.ekiga.net:3478";
     gchar * stun_enabled = "FALSE";
     GtkWidget * label;
 

src/Makefile.am

@@ -50,8 +50,7 @@ sflphoned_LDADD = \
 		@CCRTP_LIBS@ \
 		@ALSA_LIBS@ \
 		@PULSEAUDIO_LIBS@ \
-		@SAMPLERATE_LIBS@ \
-		@LIBOPENSSL_LIBS@
+		@SAMPLERATE_LIBS@ 
 
 # sflphoned_LDFLAGS= -pg -luuid
 sflphoned_LDFLAGS= -luuid

src/sipaccount.cpp

@@ -71,10 +71,10 @@ int SIPAccount::unregisterVoIPLink()
 {
     _debug("unregister account %s\n" , getAccountID().c_str());
   
-  _regc = NULL;
-
-  if(_link->sendUnregister( _accountID ))
+    if(_link->sendUnregister( _accountID )){
+        setRegistrationInfo (NULL);
         return true;
+    }
     else
         return false;
   

src/sipvoiplink.cpp

@@ -314,14 +314,12 @@ int SIPVoIPLink::sendRegister( AccountID id )
 
     /* Get the client registration information for this particular account */
     regc = account->getRegistrationInfo();
-    /* If the registration already exists, delete it */
-    if(regc) {
-        
+    /* TODO If the registration already exists, delete it */
+    /*if(regc) {
         status = pjsip_regc_destroy(regc);
         regc = NULL;
         PJ_ASSERT_RETURN( status == PJ_SUCCESS, 1 );
-    }
-
+    }*/
 
     account->setRegister(true);
 
@@ -331,7 +329,6 @@ int SIPVoIPLink::sendRegister( AccountID id )
     /* Update the state of the voip link */
     account->setRegistrationState(Trying);
 
-
     if (!validStunServer) {
         account->setRegistrationState(ErrorExistStun);
         account->setRegister(false);
@@ -387,7 +384,6 @@ int SIPVoIPLink::sendRegister( AccountID id )
         return false;
     }
 
-    
     status = pjsip_regc_send(regc, tdata);
     if (status != PJ_SUCCESS) {
         _debug("UserAgent: Unable to send regc request.\n");
@@ -435,7 +431,7 @@ SIPVoIPLink::sendUnregister( AccountID id )
         return false;
     }
 
-    account->setRegistrationInfo(regc);
+    //account->setRegistrationInfo(regc);
     account->setRegister(false);
 
     return true;
@@ -1799,11 +1795,11 @@ void call_on_tsx_changed(pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_e
                  */
                 _debug("UserAgent: The error is: %d\n", param->code);
                 switch(param->code) {
-                    case 408:
                     case 606:
                         account->setRegistrationState(ErrorConfStun);
                         break;
                     case 503:
+                    case 408:
                         account->setRegistrationState(ErrorHost);
                         break;
                     case 401:

src/user_cfg.h

@@ -79,7 +79,7 @@
 #define ADDRESSBOOK_DISPLAY_PHONE_MOBILE    "Addressbook.phone_mobile"
 
 #define EMPTY_FIELD		""			/** Default value for empty field */
-#define DFT_STUN_SERVER 	"stun.fwdnet.net:3478"	/** Default STUN server address */
+#define DFT_STUN_SERVER 	"stun.ekiga.net"	/** Default STUN server address */
 #define	YES_STR			"1"			/** Default YES value */   
 #define	NO_STR			"0"			/** Default NO value */
 #define DFT_PULSE_LENGTH_STR	"250"			/** Default DTMF lenght */