Merge branch 'm_savard'

sflphone-client-gnome/src/actions.c

@@ -1111,10 +1111,13 @@ void sflphone_fill_codec_list_per_account (account_t **account) {
     order = (gchar**) dbus_get_active_codec_list ((*account)->accountID);
     codeclist = (*account)->codecs;
 
-	// First clean the list
-	codec_list_clear (&codeclist);	
+    // First clean the list
+    codec_list_clear (&codeclist);
 
-	for (pl=order; *order; order++)
+    if(!(*order))
+      ERROR("No codec list provided");
+
+    for (pl=order; *order; order++)
     {
 		codec_t * cpy;
 		// Each account will have a copy of the system-wide capabilities

sflphone-common/src/audio/pulseaudio/pulselayer.cpp

@@ -57,14 +57,14 @@ static void stream_moved_callback(pa_stream *s UNUSED, void *userdata UNUSED)
 
 static void playback_underflow_callback (pa_stream* s,  void* userdata UNUSED)
 {
-    _debug ("Audio: Buffer Underflow");
-    pa_stream_trigger (s, NULL, NULL);
+    // _debug ("Audio: Buffer Underflow");
+    // pa_stream_trigger (s, NULL, NULL);
 }
 
 
 static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUSED)
 {
-    _debug ("Audio: Buffer OverFlow");
+    // _debug ("Audio: Buffer OverFlow");
 
 }