diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c index d89d4c89895c48014550940f31364e0f0dd7099f..b0bbe93cc79d8f211f0b52ae122112c5e07dff13 100644 --- a/sflphone-client-gnome/src/actions.c +++ b/sflphone-client-gnome/src/actions.c @@ -1049,9 +1049,9 @@ sflphone_fill_codec_list() } for(pl=codecs; *codecs; codecs++) - { - details = (gchar **)dbus_codec_details(atoi(*codecs)); - if(codec_list_get_by_payload((gconstpointer) atoi(*codecs))!=NULL){ + { + details = (gchar **)dbus_codec_details(atoi(*codecs)); + if(codec_list_get_by_payload((gconstpointer)atoi(*codecs))!=NULL){ // does nothing - the codec is already in the list, so is active. } else{ diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c index 5dc79bf37a06ef156abcafa2a54ecd16d71b6a06..240488b70fb08bd5da55ee62e5484f57d6a71ed0 100644 --- a/sflphone-client-gnome/src/callable_obj.c +++ b/sflphone-client-gnome/src/callable_obj.c @@ -50,7 +50,7 @@ gint get_state_callstruct ( gconstpointer a, gconstpointer b) gchar* call_get_peer_name (const gchar *format) { - gchar *end, *name; + const gchar *end, *name; DEBUG(" callable_obj: %s", format); diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c index c053cb88471070c52a8337a380e9349d31705325..c36e40aefe7c9b23070aee6a399a5ee0bde2c7f2 100644 --- a/sflphone-client-gnome/src/codeclist.c +++ b/sflphone-client-gnome/src/codeclist.c @@ -40,7 +40,7 @@ gint is_payload_codecstruct (gconstpointer a, gconstpointer b) { codec_t * c = (codec_t *)a; - if(c->_payload == (int)b) + if(c->_payload == GPOINTER_TO_INT(b)) return 0; else return 1; diff --git a/sflphone-client-gnome/src/codeclist.h b/sflphone-client-gnome/src/codeclist.h index 80e1520c3a0f2b74a3d3d86d339bffa7a9934fbb..3b75296b42d2e9d4baf1f407663c74a60c7f9a7a 100644 --- a/sflphone-client-gnome/src/codeclist.h +++ b/sflphone-client-gnome/src/codeclist.h @@ -27,7 +27,7 @@ typedef struct { /** Payload of the codec */ - int _payload; + gint _payload; /** Tells if the codec has been activated */ gboolean is_active; /** String description */ diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.c b/sflphone-client-gnome/src/config/accountlistconfigdialog.c index 1862c50033776945c2db6ca82b9b1ca295eb919c..5216d71a20f7acf02d94941b03d5435736c057a5 100644 --- a/sflphone-client-gnome/src/config/accountlistconfigdialog.c +++ b/sflphone-client-gnome/src/config/accountlistconfigdialog.c @@ -362,7 +362,9 @@ create_account_list(GtkDialog * dialog) G_TYPE_POINTER // Pointer to the Object ); - treeView = gtk_tree_view_new_with_model (GTK_TREE_MODEL (accountStore)); + account_list_config_dialog_fill(); + + treeView = GTK_TREE_VIEW (gtk_tree_view_new_with_model (GTK_TREE_MODEL(accountStore))); treeSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW (treeView)); g_signal_connect(G_OBJECT (treeSelection), "changed", G_CALLBACK (select_account_cb), @@ -448,7 +450,7 @@ create_account_list(GtkDialog * dialog) gtk_box_pack_start(GTK_BOX(buttonHbox), closeButton, FALSE, FALSE, 0); gtk_widget_show_all(table); - account_list_config_dialog_fill(); + // account_list_config_dialog_fill(); /* Resize the scrolledWindow for a better view */ gtk_widget_size_request(GTK_WIDGET(treeView), &requisition); diff --git a/sflphone-common/libs/iax2/iax2-parser.c b/sflphone-common/libs/iax2/iax2-parser.c index b8e62a84a12a487dd3c87fdec760d178c7a8dab3..ae4a8c2ed8e1c179b977a1647df1a09549edfeee 100644 --- a/sflphone-common/libs/iax2/iax2-parser.c +++ b/sflphone-common/libs/iax2/iax2-parser.c @@ -56,7 +56,7 @@ static unsigned short get_uint16(unsigned char *p) static void internaloutput(const char *str) { - printf(str); + printf("%s",str); } static void internalerror(const char *str) diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h index 870926c0ae2569c70ccca6f851b6c47a4faa40cd..6cd4cf773cd177590d8a4fd0ceb3b5b12b86b554 100644 --- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h +++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h @@ -161,7 +161,6 @@ namespace sfl { _mainloopSemaphore(0), _audiocodec (NULL), _audiolayer (NULL), - _ca (sipcall), _micData (NULL), _micDataConverted (NULL), _micDataEncoded (NULL), @@ -171,7 +170,8 @@ namespace sfl { _layerSampleRate(0), _codecSampleRate(0), _layerFrameSize(0), - _manager(manager) + _manager(manager), + _ca (sipcall) { setCancel (cancelDefault); diff --git a/sflphone-common/src/plug-in/librarymanager.cpp b/sflphone-common/src/plug-in/librarymanager.cpp index 0c8c1040bde8ac0497d3e7985355629662981faf..3938a6b83c185ca26b3229008c5861ff938662d3 100644 --- a/sflphone-common/src/plug-in/librarymanager.cpp +++ b/sflphone-common/src/plug-in/librarymanager.cpp @@ -92,7 +92,7 @@ int LibraryManager::resolveSymbol (const std::string &symbol, SymbolHandle *symb /************************************************************************************************/ LibraryManagerException::LibraryManagerException (const std::string &libraryName, const std::string &details, Reason reason) : - _reason (reason), _details (""), std::runtime_error ("") + std::runtime_error (""), _reason (reason), _details ("") { if (_reason == loadingFailed) diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp index 116d2df867c4b7622decbccbaf19de71f1d9ed0a..b36386dc91c327c815118c95b7ef484cb15199ed 100644 --- a/sflphone-common/src/sip/sdp.cpp +++ b/sflphone-common/src/sip/sdp.cpp @@ -375,7 +375,7 @@ void Sdp::sdp_add_zrtp_attribute (pjmedia_sdp_media* media, std::string hash) "%.*s %.*s", 4, ZRTP_VERSION, - hash.size(), + (int)hash.size(), hash.c_str()); attribute->value.slen = len;