From 0e7407ad1151830a622cde20d091a0647581fed6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 31 May 2011 10:54:34 +0200
Subject: [PATCH] fix unused variables

---
 coreapi/linphonecore.c | 9 ++++-----
 coreapi/proxy.c        | 4 ----
 coreapi/sal_eXosip2.c  | 5 ++---
 gtk/friendlist.c       | 9 ++++-----
 oRTP                   | 2 +-
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 4c6deea9a..2b8eb73e6 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1636,9 +1636,9 @@ void linphone_core_iterate(LinphoneCore *lc){
 		 linphone_core_start_invite() */
 		calls=calls->next;
 		if (call->state==LinphoneCallOutgoingInit && (curtime-call->start_time>=2)){
-				/*start the call even if the OPTIONS reply did not arrive*/
-				linphone_core_start_invite(lc,call,NULL);
-			}
+			/*start the call even if the OPTIONS reply did not arrive*/
+			linphone_core_start_invite(lc,call,NULL);
+		}
 		if (call->dir==LinphoneCallIncoming && call->state==LinphoneCallOutgoingRinging){
 			elapsed=curtime-call->start_time;
 			ms_message("incoming call ringing for %i seconds",elapsed);
@@ -1996,7 +1996,6 @@ LinphoneCall * linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddr
 **/
 LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const LinphoneAddress *addr, const LinphoneCallParams *params)
 {
-	int err=0;
 	const char *route=NULL;
 	const char *from=NULL;
 	LinphoneProxyConfig *proxy=NULL;
@@ -2049,7 +2048,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 	lc->current_call=call;
 	linphone_call_set_state (call,LinphoneCallOutgoingInit,"Starting outgoing call");
 	if (dest_proxy!=NULL || lc->sip_conf.ping_with_options==FALSE){
-		err=linphone_core_start_invite(lc,call,dest_proxy);
+		linphone_core_start_invite(lc,call,dest_proxy);
 	}else{
 		/*defer the start of the call after the OPTIONS ping*/
 		call->ping_op=sal_op_new(lc->sal);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index a4a062dca..fbbf9ce18 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -269,10 +269,6 @@ static char *guess_contact_for_register(LinphoneProxyConfig *obj){
 }
 
 static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
-	const char *id_str;
-
-	if (obj->reg_identity!=NULL) id_str=obj->reg_identity;
-	else id_str=linphone_core_get_primary_contact(obj->lc);
 	if (obj->reg_sendregister){
 		char *contact;
 		if (obj->op)
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 869a7d8bb..65c60afdd 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -561,19 +561,18 @@ int sal_call(SalOp *h, const char *from, const char *to){
 
 int sal_call_notify_ringing(SalOp *h, bool_t early_media){
 	osip_message_t *msg;
-	int err;
 	
 	/*if early media send also 180 and 183 */
 	if (early_media && h->sdp_answer){
 		msg=NULL;
 		eXosip_lock();
-		err=eXosip_call_build_answer(h->tid,180,&msg);
+		eXosip_call_build_answer(h->tid,180,&msg);
 		if (msg){
 			set_sdp(msg,h->sdp_answer);
 			eXosip_call_send_answer(h->tid,180,msg);
 		}
 		msg=NULL;
-		err=eXosip_call_build_answer(h->tid,183,&msg);
+		eXosip_call_build_answer(h->tid,183,&msg);
 		if (msg){
 			set_sdp(msg,h->sdp_answer);
 			eXosip_call_send_answer(h->tid,183,msg);
diff --git a/gtk/friendlist.c b/gtk/friendlist.c
index f19307606..d1b116272 100644
--- a/gtk/friendlist.c
+++ b/gtk/friendlist.c
@@ -70,7 +70,7 @@ static GdkPixbuf *create_status_picture(LinphoneOnlineStatus ss){
 void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid, const gchar *url, const gchar *status, const gchar *img){
 	GtkTreeIter iter;
 	LinphoneFriend *tmp=0;
-	gboolean found=FALSE;
+
 	GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
 	if (gtk_tree_model_get_iter_first(model,&iter)) {
 		do{
@@ -81,10 +81,9 @@ void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid
 				gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_STATUS,status,-1);
 				pixbuf = create_pixbuf(img);
 				if (pixbuf)
-				  {
-				    gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1);
-				  }
-				  found=TRUE;
+				{
+					gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1);
+				}
 			}
 		}while(gtk_tree_model_iter_next(model,&iter));
 	}
diff --git a/oRTP b/oRTP
index b0c5530be..eb4f54377 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit b0c5530bee255033f09011e5aab6d036e00520dc
+Subproject commit eb4f54377e2560a76a05f62a22c961edbce8f4c2