Skip to content
Snippets Groups Projects
Commit 4773f58e authored by Julien Bonjean's avatar Julien Bonjean
Browse files

Merge branch 'master' into networkmanager

parents a6902b9e 0a931f99
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ gint get_state_callstruct ( gconstpointer a, gconstpointer b) ...@@ -50,7 +50,7 @@ gint get_state_callstruct ( gconstpointer a, gconstpointer b)
gchar* call_get_peer_name (const gchar *format) gchar* call_get_peer_name (const gchar *format)
{ {
gchar *end, *name; const gchar *end, *name;
DEBUG(" callable_obj: %s", format); DEBUG(" callable_obj: %s", format);
......
...@@ -40,7 +40,7 @@ gint ...@@ -40,7 +40,7 @@ gint
is_payload_codecstruct (gconstpointer a, gconstpointer b) is_payload_codecstruct (gconstpointer a, gconstpointer b)
{ {
codec_t * c = (codec_t *)a; codec_t * c = (codec_t *)a;
if(c->_payload == (int)b) if(c->_payload == GPOINTER_TO_INT(b))
return 0; return 0;
else else
return 1; return 1;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
typedef struct { typedef struct {
/** Payload of the codec */ /** Payload of the codec */
int _payload; gint _payload;
/** Tells if the codec has been activated */ /** Tells if the codec has been activated */
gboolean is_active; gboolean is_active;
/** String description */ /** String description */
......
...@@ -362,7 +362,9 @@ create_account_list(GtkDialog * dialog) ...@@ -362,7 +362,9 @@ create_account_list(GtkDialog * dialog)
G_TYPE_POINTER // Pointer to the Object 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)); treeSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW (treeView));
g_signal_connect(G_OBJECT (treeSelection), "changed", g_signal_connect(G_OBJECT (treeSelection), "changed",
G_CALLBACK (select_account_cb), G_CALLBACK (select_account_cb),
...@@ -448,7 +450,7 @@ create_account_list(GtkDialog * dialog) ...@@ -448,7 +450,7 @@ create_account_list(GtkDialog * dialog)
gtk_box_pack_start(GTK_BOX(buttonHbox), closeButton, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(buttonHbox), closeButton, FALSE, FALSE, 0);
gtk_widget_show_all(table); gtk_widget_show_all(table);
account_list_config_dialog_fill(); // account_list_config_dialog_fill();
/* Resize the scrolledWindow for a better view */ /* Resize the scrolledWindow for a better view */
gtk_widget_size_request(GTK_WIDGET(treeView), &requisition); gtk_widget_size_request(GTK_WIDGET(treeView), &requisition);
......
...@@ -56,7 +56,7 @@ static unsigned short get_uint16(unsigned char *p) ...@@ -56,7 +56,7 @@ static unsigned short get_uint16(unsigned char *p)
static void internaloutput(const char *str) static void internaloutput(const char *str)
{ {
printf(str); printf("%s",str);
} }
static void internalerror(const char *str) static void internalerror(const char *str)
......
...@@ -30,7 +30,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ ...@@ -30,7 +30,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
$(CC_INC)../../pjlib-util/include \ $(CC_INC)../../pjlib-util/include \
$(CC_INC)../../pjnath/include \ $(CC_INC)../../pjnath/include \
$(CC_INC)../.. \ $(CC_INC)../.. \
$(SRTP_INC) $(SRTP_INC) -O2
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS) $(HOST_CXXFLAGS) $(CXXFLAGS)
export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
......
...@@ -161,7 +161,6 @@ namespace sfl { ...@@ -161,7 +161,6 @@ namespace sfl {
_mainloopSemaphore(0), _mainloopSemaphore(0),
_audiocodec (NULL), _audiocodec (NULL),
_audiolayer (NULL), _audiolayer (NULL),
_ca (sipcall),
_micData (NULL), _micData (NULL),
_micDataConverted (NULL), _micDataConverted (NULL),
_micDataEncoded (NULL), _micDataEncoded (NULL),
...@@ -171,7 +170,8 @@ namespace sfl { ...@@ -171,7 +170,8 @@ namespace sfl {
_layerSampleRate(0), _layerSampleRate(0),
_codecSampleRate(0), _codecSampleRate(0),
_layerFrameSize(0), _layerFrameSize(0),
_manager(manager) _manager(manager),
_ca (sipcall)
{ {
setCancel (cancelDefault); setCancel (cancelDefault);
......
...@@ -92,7 +92,7 @@ int LibraryManager::resolveSymbol (const std::string &symbol, SymbolHandle *symb ...@@ -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) : 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) if (_reason == loadingFailed)
......
...@@ -375,7 +375,7 @@ void Sdp::sdp_add_zrtp_attribute (pjmedia_sdp_media* media, std::string hash) ...@@ -375,7 +375,7 @@ void Sdp::sdp_add_zrtp_attribute (pjmedia_sdp_media* media, std::string hash)
"%.*s %.*s", "%.*s %.*s",
4, 4,
ZRTP_VERSION, ZRTP_VERSION,
hash.size(), (int)hash.size(),
hash.c_str()); hash.c_str());
attribute->value.slen = len; attribute->value.slen = len;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment