Merge branch 'conference'

sflphone-client-gnome/src/config/preferencesdialog.c

@@ -140,10 +140,12 @@ static void key_exchange_changed_cb(GtkWidget *widget, gpointer data)
     DEBUG("Key exchange changed");
     if (g_strcasecmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)), (gchar *) "ZRTP") == 0) {
         gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
+	g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("true"));
         g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(ZRTP));
     } else {
         gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
         DEBUG("Setting key exchange %s to %s\n", ACCOUNT_KEY_EXCHANGE, KEY_EXCHANGE_NONE);
+	g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup("false"));
         g_hash_table_replace(directIpCallsProperties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup(KEY_EXCHANGE_NONE));
     }
 }
@@ -180,7 +182,9 @@ GtkWidget* create_direct_ip_calls_tab()
     directIpCallsProperties = sflphone_get_ip2ip_properties();
               
     if(directIpCallsProperties != NULL) {
+	DEBUG("got a directIpCallsProperties");
         curSRTPEnabled = g_hash_table_lookup(directIpCallsProperties, ACCOUNT_SRTP_ENABLED);
+	DEBUG("    curSRTPEnabled = %s", curSRTPEnabled);
         curKeyExchange = g_hash_table_lookup(directIpCallsProperties, ACCOUNT_KEY_EXCHANGE);
         curTlsEnabled = g_hash_table_lookup(directIpCallsProperties, TLS_ENABLE);        
     }

sflphone-common/src/sip/sipaccount.cpp

@@ -514,6 +514,10 @@ std::string SIPAccount::getContactHeader (const std::string& address, const std:
         transport = "";
     }
 
+    _displayName = Manager::instance().getConfigString(_accountID, DISPLAY_NAME);
+
+    _debug("Display Name: %s\n", _displayName.c_str());
+
     int len = pj_ansi_snprintf (contact, PJSIP_MAX_URL_SIZE,
 
                                 "%s%s<%s%s%s%s%s%s:%d%s>",

sflphone-common/src/sip/sipaccount.h

@@ -321,7 +321,7 @@ class SIPAccount : public Account
         
         pjsip_transport_type_e _transportType;
 
-		pjsip_transport* _transport;
+	pjsip_transport* _transport;
 
         // Special hack that is not here to stay
         // See #1852
@@ -337,19 +337,19 @@ class SIPAccount : public Account
         // a sip transport. 
         pjsip_tls_setting * _tlsSetting;	                                                  
 
-		// The STUN server name, if applicable
+        // The STUN server name, if applicable
         pj_str_t _stunServerName;	                                                  
 
-		// The STUN server port, if applicable
-		pj_uint16_t _stunPort;
+	// The STUN server port, if applicable
+	pj_uint16_t _stunPort;
         
         // Display Name that can be used in  SIP URI.        
         std::string _displayName;        
 
-		// The actual address we use in the SDP to be contacted
-		// it needs to be per account, otherwise the same address is used for every account
-		std::string _actualSessionAddress;
-		pj_uint16_t _actualSessionPort;
+	// The actual address we use in the SDP to be contacted
+	// it needs to be per account, otherwise the same address is used for every account
+	std::string _actualSessionAddress;
+        pj_uint16_t _actualSessionPort;
 };
 
 #endif