fix crash without tunnel, fix compilation on debian 6

This commit is contained in:
Simon Morlat 2014-11-16 12:09:22 +01:00
parent 1716178e38
commit 89ac410152
2 changed files with 3 additions and 1 deletions

View file

@ -311,10 +311,12 @@ static int _sal_op_send_request_with_contact(SalOp* op, belle_sip_request_t* req
}
}
}else{
#ifdef TUNNEL_ENABLED
if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(udplp,belle_sip_tunnel_listening_point_t)){
/* our tunnel mode only supports UDP. Force transport to be set to UDP */
belle_sip_uri_set_transport_param(next_hop_uri,"udp");
}
#endif
}
if ((strcmp(method,"REGISTER")==0 || strcmp(method,"SUBSCRIBE")==0) && transport &&
(strcasecmp(transport,"TCP")==0 || strcasecmp(transport,"TLS")==0)){

View file

@ -74,7 +74,7 @@ static void drag_data_received(GtkWidget *widget, GdkDragContext *context, gint
}
static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data){
#if GTK_CHECK_VERSION(2,20,0)
#if GTK_CHECK_VERSION(2,21,0)
GList *l=gdk_drag_context_list_targets(drag_context);
GList *elem;