diff --git a/Classes/CallDelegate.h b/Classes/CallDelegate.h
index 516c2074d..df2bf75e0 100644
--- a/Classes/CallDelegate.h
+++ b/Classes/CallDelegate.h
@@ -22,21 +22,19 @@
 
 enum CallDelegateType {
     CD_UNDEFINED = 0,
-    CD_NEW_CALL,
     CD_ZRTP,
     CD_VIDEO_UPDATE,
-    CD_STOP_VIDEO_ON_LOW_BATTERY,
-    CD_TRANSFER_CALL
+    CD_STOP_VIDEO_ON_LOW_BATTERY
 };
 
-@protocol UIActionSheetCustomDelegate 
+@protocol CallActionSheetDelegate
 - (void)actionSheet:(UIActionSheet *)actionSheet ofType:(enum CallDelegateType) type clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void*) datas;
 @end
 
 @interface CallDelegate : NSObject<UIActionSheetDelegate> {
     enum CallDelegateType eventType;
     LinphoneCall* call;
-    id<UIActionSheetCustomDelegate> delegate;
+    id<CallActionSheetDelegate> delegate;
     NSTimer* timeout;
 }
 
diff --git a/Classes/CallDelegate.m b/Classes/CallDelegate.m
index b7b6ed366..982a99ff1 100644
--- a/Classes/CallDelegate.m
+++ b/Classes/CallDelegate.m
@@ -18,6 +18,7 @@
  */
 
 #import "CallDelegate.h"
+#import "Utils.h"
 
 @implementation CallDelegate
 
@@ -32,7 +33,7 @@
         timeout = nil;
     }
     if (eventType == CD_UNDEFINED) {
-        ms_error("Incorrect usage of CallDelegate/ActionSheet: eventType must be set");
+        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
     }
     [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:buttonIndex withUserDatas:call];
 }
@@ -47,7 +48,7 @@
 	if (buttonIndex != actionSheet.cancelButtonIndex) return;
 	
     if (eventType == CD_UNDEFINED) {
-        ms_error("Incorrect usage of CallDelegate/ActionSheet: eventType must be set");
+        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
     }
 	
     [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:buttonIndex withUserDatas:call];    
@@ -59,7 +60,7 @@
         timeout = nil;
     }
     if (eventType == CD_UNDEFINED) {
-        ms_error("Incorrect usage of CallDelegate/ActionSheet: eventType must be set");
+        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
     }
     [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:actionSheet.cancelButtonIndex withUserDatas:call];
 }