[#2165] Fix several merge problems

sflphone-client-gnome/pixmaps/Makefile.am

@@ -2,57 +2,7 @@ icondir   = $(datadir)/pixmaps
 
 icon_DATA = sflphone.svg
 
-buttons_DATA = accept.svg 
-	       current.svg 
-               transfert.svg 
-               hang_up.svg 
-               hold.svg 
-               unhold.svg 
-               refuse.svg 
-               call.svg 
-               ring.svg 
-               dial.svg 
-               mic.svg 
-               mic_25.svg 
-               mic_50.svg 
-               mic_75.svg 
-               speaker.svg 
-               speaker_25.svg 
-               speaker_50.svg 
-               speaker_75.svg 
-               fail.svg 
-               incoming.svg 
-               outgoing.svg 
-               missed.svg 
-               mailbox.svg 
-               busy.svg 
-               icon_accept.svg 
-               icon_hold.svg 
-               icon_unhold.svg 
-               icon_hangup.svg 
-               icon_call.svg 
-               icon_dialpad.svg 
-               icon_volume.svg 
-               icon_dialpad_off.svg 
-               icon_volume_off.svg 
-               history2.svg 
-               sflphone.svg 
-               sflphone_small.svg 
-               stock_person.svg 
-               icon_rec.svg 
-               rec_call.svg 
-               addressbook.svg 
-               contact_default.svg 
-               face-monkey.svg 
-               users.svg 
-               usersActive.svg 
-               home.svg 
-               wait-on.gif
-               lock_certified.svg  
-	       lock_confirmed.svg  
-	       lock_error.svg  
-               lock_off.svg
-               lock_unconfirmed.svg
+buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history2.svg sflphone.svg sflphone_small.svg stock_person.svg icon_rec.svg rec_call.svg addressbook.svg contact_default.svg face-monkey.svg users.svg usersActive.svg home.svg wait-on.gif lock_certified.svg lock_confirmed.svg lock_error.svg lock_off.svg lock_unconfirmed.svg
 
 buttonsdir   = $(datadir)/sflphone
 EXTRA_DIST   = $(buttons_DATA) $(icon_DATA)

sflphone-client-gnome/src/Makefile.am

@@ -27,7 +27,7 @@ sflphone_client_gnome_SOURCES = \
   reqaccount.c
 
 noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
-                  assistant.h reqaccount.h errors.h sflphone_const.h \
+                  reqaccount.h errors.h sflphone_const.h \
                   menus.h accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h toolbar.h
 
 

sflphone-client-gnome/src/actions.c

@@ -1226,7 +1226,7 @@ sflphone_srtp_on( callable_obj_t * c)
 {
     c->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
 
-    calltree_update_call(current_calls, c);
+    calltree_update_call(current_calls, c, NULL);
     update_menus();
 }
 
@@ -1234,7 +1234,7 @@ sflphone_srtp_on( callable_obj_t * c)
 sflphone_srtp_off( callable_obj_t * c )
 {
     c->_srtp_state = SRTP_STATE_UNLOCKED;
-    calltree_update_call(current_calls, c);
+    calltree_update_call(current_calls, c, NULL);
     update_menus();
 }
 
@@ -1250,7 +1250,7 @@ sflphone_srtp_show_sas( callable_obj_t * c, const gchar* sas, const gboolean ver
     } else {
         c->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
     }
-    calltree_update_call(current_calls, c);
+    calltree_update_call(current_calls, c, NULL);
     update_menus();
 }
 
@@ -1298,6 +1298,6 @@ sflphone_call_state_changed( callable_obj_t * c, const gchar * description, cons
         c->_state_code = code;   
     }
     
-    calltree_update_call(current_calls, c);
+    calltree_update_call(current_calls, c, NULL);
     update_menus();
 }

sflphone-client-gnome/src/contacts/calltree.c

@@ -270,12 +270,12 @@ row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
                         selectedCall->_zrtp_confirmed = TRUE;
                     }
                     dbus_confirm_sas(selectedCall);
-                    calltree_update_call(current_calls, selectedCall);
+                    calltree_update_call(current_calls, selectedCall, NULL);
                     break;
                 case SRTP_STATE_SAS_CONFIRMED:
                     selectedCall->_srtp_state = SRTP_STATE_SAS_UNCONFIRMED;
                     dbus_reset_sas(selectedCall);
-                    calltree_update_call(current_calls, selectedCall);
+                    calltree_update_call(current_calls, selectedCall, NULL);
                     break;
                 default:
                     DEBUG("Single click but no action");

sflphone-common/src/audio/audiortp/AudioRtpSession.h

@@ -238,7 +238,9 @@ namespace sfl {
     {
         assert(_ca);
 
-        _audiocodec = _ca->getLocalSDP()->get_session_media ();
+	AudioCodecType pl = (AudioCodecType)_ca->getLocalSDP()->get_session_media()->getPayload();
+	_audiocodec = _manager->getCodecDescriptorMap().instantiateCodec(pl);
+
         if (_audiocodec == NULL) {
             _debug ("No audiocodec, can't init RTP media\n");
             throw AudioRtpSessionException();

sflphone-common/test/Makefile.am

@@ -145,6 +145,8 @@ mainbufferTester_LDADD = \
 		@CCEXT2_LIBS@ \
 		@CCGNU2_LIBS@ \
 		@CCRTP_LIBS@ \
+		@ZRTPCPP_LIBS@ \
+		@libssl_LIBS@ \
 		@SAMPLERATE_LIBS@ \
 		$(PJSIP_LIBS) \
 		-luuid \