From 260f57f6d53d6d742bbcb6fe1041aea81540e231 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Thu, 24 Nov 2011 10:53:17 +0100
Subject: [PATCH] Add missing files

---
 Classes/IncallViewController.h |   1 +
 Classes/IncallViewController.m |  40 +++++++++++++++++++--------------
 Resources/contact_vide.png     | Bin 0 -> 3524 bytes
 Resources/secured.png          | Bin 0 -> 838 bytes
 submodules/linphone            |   2 +-
 5 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100755 Resources/contact_vide.png
 create mode 100644 Resources/secured.png

diff --git a/Classes/IncallViewController.h b/Classes/IncallViewController.h
index f50953aeb..36a7f91c6 100644
--- a/Classes/IncallViewController.h
+++ b/Classes/IncallViewController.h
@@ -66,6 +66,7 @@
 	
 	ABPeoplePickerNavigationController* myPeoplePickerController;
     
+    UITableViewCell* activeCallCell;
     
 	VideoViewController* mVideoViewController;
     BOOL mVideoShown;
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index a01f7665b..bfce10358 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -110,8 +110,8 @@ int callCount(LinphoneCore* lc) {
 	[star initWithNumber:'*'];
 	[hash initWithNumber:'#'];
     
-    [addCall addTarget:self action:@selector(addCallPressed) forControlEvents:UIControlEventTouchDown];
-    [mergeCalls addTarget:self action:@selector(mergeCallsPressed) forControlEvents:UIControlEventTouchDown];
+    [addCall addTarget:self action:@selector(addCallPressed) forControlEvents:UIControlEventTouchUpInside];
+    [mergeCalls addTarget:self action:@selector(mergeCallsPressed) forControlEvents:UIControlEventTouchUpInside];
     //[endCtrl addTarget:self action:@selector(endCallPressed) forControlEvents:UIControlEventTouchUpInside];
     [addToConf addTarget:self action:@selector(addToConfCallPressed) forControlEvents:UIControlEventTouchUpInside];
     [pause addTarget:self action:@selector(pauseCallPressed) forControlEvents:UIControlEventTouchUpInside];
@@ -131,9 +131,9 @@ int callCount(LinphoneCore* lc) {
     [self dismissModalViewControllerAnimated:true];
 }
 
+
 -(void) mergeCallsPressed {
     LinphoneCore* lc = [LinphoneManager getLc];
-    
     linphone_core_add_all_to_conference(lc);
 }
 
@@ -303,6 +303,7 @@ int callCount(LinphoneCore* lc) {
 	}
 }
 -(void) updateUIFromLinphoneState:(UIViewController *)viewCtrl {
+    activeCallCell = nil;
     [mute reset];
     // if (
     // [pause reset];
@@ -446,20 +447,19 @@ int callCount(LinphoneCore* lc) {
 }
 
 -(void) updateGlow {
-    glow += 0.1;
+    if (!activeCallCell)
+        return;
     
-    NSIndexPath* path = [callTableView indexPathForSelectedRow];
-    if (path) {
-        UITableViewCell* cell = [callTableView cellForRowAtIndexPath:path];
-        [self updateActive:YES cell:cell];
-        [cell.backgroundView setNeedsDisplay];
-        [cell setNeedsDisplay];
-        [callTableView setNeedsDisplay];
-    }
+    glow += 0.1;
+
+    [self updateActive:YES cell:activeCallCell];
+    [activeCallCell.backgroundView setNeedsDisplay];
+    [activeCallCell setNeedsDisplay];
+    [callTableView setNeedsDisplay];
 }
 
 -(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
-    [self updateActive:(cell.accessoryType == UITableViewCellAccessoryCheckmark) cell:cell];
+    [self updateActive:(cell == activeCallCell) cell:cell];
     //cell.accessoryType = UITableViewCellAccessoryNone;
 }
 
@@ -605,12 +605,18 @@ int callCount(LinphoneCore* lc) {
     ((UIImageView*)cell.accessoryView).image = nil;
     
     LinphoneCore* lc = [LinphoneManager getLc];
-    if (indexPath.row == 0 && linphone_core_get_conference_size(lc) > 0)
+    if (indexPath.row == 0 && linphone_core_get_conference_size(lc) > 0) {
         [self updateConferenceCell:cell at:indexPath];
-    else
-        [self updateCell:cell at:indexPath withCall: [self retrieveCallAtIndex:indexPath.row inConference:NO]
+        if (linphone_core_is_in_conference(lc))
+            activeCallCell = cell;
+    } else {
+        LinphoneCall* call = [self retrieveCallAtIndex:indexPath.row inConference:NO];
+        [self updateCell:cell at:indexPath withCall: call
             conferenceActive:linphone_core_is_in_conference(lc)];
-
+        if (linphone_core_get_current_call(lc) == call)
+            activeCallCell = cell;
+    }
+    
     cell.userInteractionEnabled = YES; 
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     //cell.selectionStyle = UITableViewCellSelectionStyleBlue;
diff --git a/Resources/contact_vide.png b/Resources/contact_vide.png
new file mode 100755
index 0000000000000000000000000000000000000000..e929b54bab63f5dfa8d50784add3257d9fd4fb0e
GIT binary patch
literal 3524
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

literal 0
HcmV?d00001

diff --git a/Resources/secured.png b/Resources/secured.png
new file mode 100644
index 0000000000000000000000000000000000000000..61042339fedddbbc1ae3a315c62a64ef357f1b65
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000>P000*V1^@s6{^R5m00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipo2
z4HPx$pLt~f00PEIL_t(Y$F-GDPZL2H#(y*0Zjm;c7!Ci51Z@>qqkaN7a5r8|Og{l9
z6HiK{WCatWM{XQQJT=jSH{*!|=qHf0)L2CMqoPC%pi=1Wc-Y;x+m<cCxXC6n^Ugfa
zJMa6<`@(<v-kF`{ap))q3aQkgwnQdV9<SbsvlCM&At>3EJt7D^KXaYXY^<ph2N&nC
z6`(3``ay~0qpyu`qJZppoY1Lubp0eYj!V5mvtie)s<w*dxnaw;MIDGoP)Cv<>mesC
z1R%pvq#na&+cWPUauE?J3{p(YSFQL-%Ou%!97|ZvL<=MIRzxI9BJ&UcYsffq((RHz
zKoVeaw9A(r5s8r;c}35S(K>+TxnZ$9HyoHt8QLdzzr#;rhpW!WQw-c&2vE~hV}nxF
z5kzT{ta;Xf%$Z$20>jLb9q%SP9xpFj(?&-#B4ctLq@M^CabT4zI|U9wy1Pn1<!>kG
zW*(_wuKQnwg2nVXq=y%gEv^H80&Ci^T@nQ-Yud2gHRalsGv9QGCRTkAwzQF+*GaQ*
zs8|5Yb+PsbD7kh#BBd$cZDjqUZzvosKumQH+6h~O4NG^=bK&s^jEU7_7sXuq8UvFJ
zB<&6MP89#C>K0PB(U%4r7SnR#u?6b+O`owd`r|l!qL4~y)zO!&nj0~pQP|w}?f(4h
z^l>j%DfB`jd(Dq1Kt@`Tktk~~#~K~70su>1UvYbjR!q#RiU?MmoLrt*L+UYv9tFLX
zZ*O0)^W{Bo#><;lRpx8|kf*){GfpuvU#iWxPp_YzjSz0{M{nyxZ|}$cy~W=5McS|4
zYT6+IU%9uW<chh{_))CCnW3fY5_(%d2OD|zH}dRG%^o=!#pFENpFR4XY&LJdyFb?`
zZsgc{@HEi#NMSIr?>Fu7wc#lyUppmT2tXke*h*pK*I5du1RxTbj9rWK7tuWaVJKg1
Q^Z)<=07*qoM6N<$f{rD0jsO4v

literal 0
HcmV?d00001

diff --git a/submodules/linphone b/submodules/linphone
index 53b732a7d..0d04b9451 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 53b732a7d32fe1f3005f39e446fb860de0afa97c
+Subproject commit 0d04b9451bf845e8bd7f047504f689292e099554