Modify some type names 66/94766/1 accepted/tizen/common/20161108.131727 accepted/tizen/ivi/20161110.001815 accepted/tizen/mobile/20161110.001804 submit/tizen/20161108.060735 submit/tizen/20161109.095310
authorWootak Jung <wootak.jung@samsung.com>
Tue, 1 Nov 2016 05:56:39 +0000 (14:56 +0900)
committerWootak Jung <wootak.jung@samsung.com>
Tue, 1 Nov 2016 05:56:39 +0000 (14:56 +0900)
- NOTE: Need to be merged with application patch

Change-Id: I550a2420db7b71b6ba909f2b3d8ec476a6db49f8

include/call-manager-common.h
include/call-manager-ext.h
include/call-manager-extension.h
packaging/libcall-manager.spec
src/call-manager.c
test/test.c

index b63957bbf58baab08efe9c5fde0e58be3631fe39..8ca4418b82d9a852993bf924bdb14f9977c1bb48 100644 (file)
@@ -161,7 +161,7 @@ struct __cm_call_data {
        cm_call_domain_e call_domain;   /**< Current Call domain */
        int person_id;          /**< Contact Index */
        long start_time;                /**<Call start time */
-       cm_name_mode_e name_mode;       /**<Name Mode */
+       cm_call_name_mode_e name_mode;  /**<Name Mode */
        int session_id;         /**<Session id used for ims call */
        int is_hd_enable;                       /*< Whether HD/LTE icon should be displayed in UI or not for ims call */
        int is_wifi_calling;                    /* Whether call is through wifi  */
@@ -175,16 +175,16 @@ struct __cm_call_event_data {
        cm_multi_sim_slot_type_e sim_slot;
        cm_call_end_cause_type_e end_cause;
 
-       cm_call_data_t *incom;  /* Incoming CallData, Important : Application should free this after use */
-       cm_call_data_t *active_dial;    /* Active or Dial CallData, Important : Application should free this after use */
-       cm_call_data_t *held;   /* Held CallData, Important : Application should free this after use */
+       cm_call_data_h incom;   /* Incoming CallData, Important : Application should free this after use */
+       cm_call_data_h active_dial;     /* Active or Dial CallData, Important : Application should free this after use */
+       cm_call_data_h held;    /* Held CallData, Important : Application should free this after use */
 };
 
 struct __cm_conf_call_data {
        unsigned int call_id;                                                   /**< Unique call id*/
        char *call_number;                                                      /**< call number */
        int person_id;                                                          /**< Contact Index */
-       cm_name_mode_e name_mode;                                       /**<Name Mode */
+       cm_call_name_mode_e name_mode;                                  /**<Name Mode */
 };
 
 #define MAKE_CALL_STATE_ASYNC_DATA(data,cb,ud)  \
index 7603badae596208b9b5684deeaa1f48063602d40..215178908277e8d0f96caf8429c7d6c8141b9689 100644 (file)
@@ -156,7 +156,7 @@ int cm_activate_ui(cm_client_h handle);
 int cm_set_lcd_timeout(cm_client_h handle, cm_lcd_timeout_e timeout);
 int cm_get_all_call_list(cm_client_h handle, GSList **call_list);
 int cm_get_conference_call_list(cm_client_h handle, GSList **call_list);
-int cm_get_all_calldata(cm_client_h handle, cm_call_data_t **incom, cm_call_data_t **active, cm_call_data_t **held);
+int cm_get_all_calldata(cm_client_h handle, cm_call_data_h *incom, cm_call_data_h *active, cm_call_data_h *held);
 int cm_start_voice_record(cm_client_h handle, char *call_num);
 int cm_stop_voice_record(cm_client_h handle);
 
@@ -172,22 +172,22 @@ int cm_set_voice_record_status_cb(cm_client_h handle, cm_voice_record_status_cb
 int cm_unset_voice_record_status_cb (cm_client_h handle);
 
 /* GSList of cm_call_data_t structures */
-int cm_call_data_get_person_id(cm_call_data_t *call_data, int *person_id);
-int cm_call_data_get_call_member_count(cm_call_data_t *call_data, int *member_count);
-int cm_call_data_is_emergency_call(cm_call_data_t *call_data, gboolean *is_emergency);
-int cm_call_data_is_voicemail_number(cm_call_data_t *call_data, gboolean *is_voicemail_number);
-int cm_call_data_get_start_time(cm_call_data_t *call_data, long *start_time);
-int cm_call_data_get_session_id(cm_call_data_t *call_data, int *session_id);
-int cm_call_data_get_hd_icon_state(cm_call_data_t *call_data, int *is_hd_enable);
-int cm_call_data_get_is_wifi_calling(cm_call_data_t *call_data, int *is_wifi_calling);
-int cm_call_data_get_upgrade_downgrade_state(cm_call_data_t *call_data, int *is_upgrade_downgrade_enable);
-int cm_call_data_get_is_added_to_conf(cm_call_data_t *call_data, int *is_added_to_conf);
-int cm_call_data_get_is_remote_on_hold(cm_call_data_t *call_data, int *is_remote_on_hold);
+int cm_call_data_get_person_id(cm_call_data_call_data, int *person_id);
+int cm_call_data_get_call_member_count(cm_call_data_call_data, int *member_count);
+int cm_call_data_is_emergency_call(cm_call_data_call_data, gboolean *is_emergency);
+int cm_call_data_is_voicemail_number(cm_call_data_call_data, gboolean *is_voicemail_number);
+int cm_call_data_get_start_time(cm_call_data_call_data, long *start_time);
+int cm_call_data_get_session_id(cm_call_data_call_data, int *session_id);
+int cm_call_data_get_hd_icon_state(cm_call_data_call_data, int *is_hd_enable);
+int cm_call_data_get_is_wifi_calling(cm_call_data_call_data, int *is_wifi_calling);
+int cm_call_data_get_upgrade_downgrade_state(cm_call_data_call_data, int *is_upgrade_downgrade_enable);
+int cm_call_data_get_is_added_to_conf(cm_call_data_call_data, int *is_added_to_conf);
+int cm_call_data_get_is_remote_on_hold(cm_call_data_call_data, int *is_remote_on_hold);
 
 int cm_conf_call_data_get_call_id(cm_conf_call_data_t *conf_call, unsigned int *call_id);
 int cm_conf_call_data_get_call_number(cm_conf_call_data_t *conf_call, char **call_number);
 int cm_conf_call_data_get_person_id(cm_conf_call_data_t *conf_call, int *person_id);
-int cm_conf_call_data_get_name_mode(cm_conf_call_data_t *conf_call, cm_name_mode_e *name_mode);
+int cm_conf_call_data_get_name_mode(cm_conf_call_data_t *conf_call, cm_call_name_mode_e *name_mode);
 int cm_conf_call_data_free(cm_conf_call_data_t *conf_call);
 
 int cm_set_lcd_state(cm_lcd_control_state_e state);
index 537a408ff39df0b8544d692c78aecc941e3b38e0..96e04a249806bb25b333f8f4df80451130569dbc 100644 (file)
   * @brief The handle for Call data.
   * @since_tizen 2.4.0.4
   */
-typedef struct __cm_call_data cm_call_data_t;
+typedef struct __cm_call_data *cm_call_data_h;
 
 /**
   * @brief The handle for Call event data.
   * @since_tizen 2.4.0.4
   */
-typedef struct __cm_call_event_data cm_call_event_data_t;
+typedef struct __cm_call_event_data *cm_call_event_data_h;
 
 /**
 * @brief To end any active call need to pass release type in cm_end_call() as parameter.
@@ -44,10 +44,10 @@ typedef struct __cm_call_event_data cm_call_event_data_t;
 * @see cm_end_call() API
 */
 typedef enum {
-       CALL_RELEASE_TYPE_BY_CALL_HANDLE = 0, /**< Release call using given call_handle*/
-       CALL_RELEASE_TYPE_ALL_CALLS,               /**< Release all Calls*/
-       CALL_RELEASE_TYPE_ALL_HOLD_CALLS,  /**< Releases all hold calls*/
-       CALL_RELEASE_TYPE_ALL_ACTIVE_CALLS,    /**< Releases all active calls*/
+       CM_CALL_RELEASE_TYPE_BY_CALL_HANDLE = 0, /**< Release call using given call_handle*/
+       CM_CALL_RELEASE_TYPE_ALL_CALLS,            /**< Release all Calls*/
+       CM_CALL_RELEASE_TYPE_ALL_HOLD_CALLS,  /**< Releases all hold calls*/
+       CM_CALL_RELEASE_TYPE_ALL_ACTIVE_CALLS,    /**< Releases all active calls*/
 } cm_call_release_type_e;
 
 /**
@@ -87,9 +87,9 @@ typedef enum _call_event {
  * @see cm_call_event_data_get_sim_slot() API
  */
 typedef enum {
-       CM_SIM_SLOT_1,  /**< Sim slot 1 */
-       CM_SIM_SLOT_2,  /**< Sim slot 2 */
-       CM_SIM_SLOT_DEFAULT_E,          /**< Follow system configuration*/
+       CM_MULTI_SIM_SLOT_1,    /**< Sim slot 1 */
+       CM_MULTI_SIM_SLOT_2,    /**< Sim slot 2 */
+       CM_MULTI_SIM_SLOT_DEFAULT,              /**< Follow system configuration*/
 } cm_multi_sim_slot_type_e;
 
 /**
@@ -154,7 +154,7 @@ typedef enum {
        CM_CALL_NAME_MODE_UNKNOWN,                      /**<  Unknown*/
        CM_CALL_NAME_MODE_PRIVATE,              /**<  Private*/
        CM_CALL_NAME_MODE_PAYPHONE,                     /**<  Payphone*/
-} cm_name_mode_e;
+} cm_call_name_mode_e;
 
 /**
  * @brief This enum defines the Call end cause type.
@@ -163,39 +163,38 @@ typedef enum {
  * @see cm_call_event_data_get_end_cause() API
  */
 typedef enum {
-       CM_CALL_ENDCAUSE_CALL_ENDED,                                            /**< Call ended */
-
-       CM_CALL_ENDCAUSE_CALL_DISCONNECTED,                             /**< Call disconnected */
-       CM_CALL_ENDCAUSE_CALL_SERVICE_NOT_ALLOWED,              /**< Service not allowed */
-       CM_CALL_ENDCAUSE_CALL_BARRED,                                           /**< Call barred */
-       CM_CALL_ENDCAUSE_NO_SERVICE,                                            /**< No Service */
-       CM_CALL_ENDCAUSE_NW_BUSY,                                                       /**< Network busy */
-
-       CM_CALL_ENDCAUSE_NW_FAILED,                                             /**< Network failed */
-       CM_CALL_ENDCAUSE_NO_ANSWER,                                             /**< No anwer from other party */
-       CM_CALL_ENDCAUSE_NO_CREDIT,                                             /**< No credit available */
-       CM_CALL_ENDCAUSE_REJECTED,                                                      /**< Call rejected */
-       CM_CALL_ENDCAUSE_USER_BUSY,                                             /**< user busy */
-
-       CM_CALL_ENDCAUSE_WRONG_GROUP,                                   /**< Wrong group */
-       CM_CALL_ENDCAUSE_CALL_NOT_ALLOWED,                              /**< Call not allowed */
-       CM_CALL_ENDCAUSE_TAPI_ERROR,                                            /**< Tapi error */
-       CM_CALL_ENDCAUSE_CALL_FAILED,                                           /**< Call Failed */
-       CM_CALL_ENDCAUSE_NO_USER_RESPONDING,                            /**< User not responding */
-
-       CM_CALL_ENDCAUSE_USER_ALERTING_NO_ANSWER,               /**< User Alerting No Answer */
-       CM_CALL_ENDCAUSE_SERVICE_TEMP_UNAVAILABLE,              /**< Circuit Channel Unavailable,Network is out of Order,Switching equipment congestion,Temporary Failure */
-       CM_CALL_ENDCAUSE_USER_UNAVAILABLE,                              /**< Called Party Rejects the Call */
-       CM_CALL_ENDCAUSE_INVALID_NUMBER_FORMAT,                 /**< Entered number is invalid or incomplete */
-       CM_CALL_ENDCAUSE_NUMBER_CHANGED,                                /**< Entered number has been changed */
-
-       CM_CALL_ENDCAUSE_UNASSIGNED_NUMBER,                             /**< Unassigned/Unallocated number*/
-       CM_CALL_ENDCAUSE_USER_DOESNOT_RESPOND,                  /**< Called Party does not respond*/
-       CM_CALL_ENDCAUSE_IMEI_REJECTED,                 /**< Called Party does not respond*/
-       CM_CALL_ENDCAUSE_FIXED_DIALING_NUMBER_ONLY,                     /**< FDN Number only */
-       CM_CALL_ENDCAUSE_REJ_SAT_CALL_CTRL,                             /**< SAT call control reject */
-       CM_CALL_ENDCAUSE_CANNOT_RECEIVE_VIDEO_CALL,     /**< This number cannot receive video calls.*/
-       CM_CALL_ENDCAUSE_MAX,
+       CM_CALL_END_CAUSE_CALL_ENDED,                                           /**< Call ended */
+
+       CM_CALL_END_CAUSE_CALL_DISCONNECTED,                            /**< Call disconnected */
+       CM_CALL_END_CAUSE_CALL_SERVICE_NOT_ALLOWED,             /**< Service not allowed */
+       CM_CALL_END_CAUSE_CALL_BARRED,                                          /**< Call barred */
+       CM_CALL_END_CAUSE_NO_SERVICE,                                           /**< No Service */
+       CM_CALL_END_CAUSE_NW_BUSY,                                                      /**< Network busy */
+
+       CM_CALL_END_CAUSE_NW_FAILED,                                            /**< Network failed */
+       CM_CALL_END_CAUSE_NO_ANSWER,                                            /**< No anwer from other party */
+       CM_CALL_END_CAUSE_NO_CREDIT,                                            /**< No credit available */
+       CM_CALL_END_CAUSE_REJECTED,                                                     /**< Call rejected */
+       CM_CALL_END_CAUSE_USER_BUSY,                                            /**< user busy */
+
+       CM_CALL_END_CAUSE_WRONG_GROUP,                                  /**< Wrong group */
+       CM_CALL_END_CAUSE_CALL_NOT_ALLOWED,                             /**< Call not allowed */
+       CM_CALL_END_CAUSE_TAPI_ERROR,                                           /**< Tapi error */
+       CM_CALL_END_CAUSE_CALL_FAILED,                                          /**< Call Failed */
+       CM_CALL_END_CAUSE_NO_USER_RESPONDING,                           /**< User not responding */
+
+       CM_CALL_END_CAUSE_USER_ALERTING_NO_ANSWER,              /**< User Alerting No Answer */
+       CM_CALL_END_CAUSE_SERVICE_TEMP_UNAVAILABLE,             /**< Circuit Channel Unavailable,Network is out of Order,Switching equipment congestion,Temporary Failure */
+       CM_CALL_END_CAUSE_USER_UNAVAILABLE,                             /**< Called Party Rejects the Call */
+       CM_CALL_END_CAUSE_INVALID_NUMBER_FORMAT,                        /**< Entered number is invalid or incomplete */
+       CM_CALL_END_CAUSE_NUMBER_CHANGED,                               /**< Entered number has been changed */
+
+       CM_CALL_END_CAUSE_UNASSIGNED_NUMBER,                            /**< Unassigned/Unallocated number*/
+       CM_CALL_END_CAUSE_USER_DOESNOT_RESPOND,                 /**< Called Party does not respond*/
+       CM_CALL_END_CAUSE_IMEI_REJECTED,                        /**< Called Party does not respond*/
+       CM_CALL_END_CAUSE_FIXED_DIALING_NUMBER_ONLY,                    /**< FDN Number only */
+       CM_CALL_END_CAUSE_REJ_SAT_CALL_CTRL,                            /**< SAT call control reject */
+       CM_CALL_END_CAUSE_CANNOT_RECEIVE_VIDEO_CALL,    /**< This number cannot receive video calls.*/
 }cm_call_end_cause_type_e;
 
 /**
@@ -210,7 +209,7 @@ typedef enum {
  * @see cm_set_call_event_cb()
  * @see cm_unset_call_event_cb()
  */
-typedef void (*cm_call_event_cb) (cm_call_event_e call_event, cm_call_event_data_t *event_data, void *user_data);
+typedef void (*cm_call_event_cb) (cm_call_event_e call_event, cm_call_event_data_event_data, void *user_data);
 
 
 /**
@@ -277,7 +276,7 @@ int cm_unset_call_event_cb(cm_client_h handle);
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_free(cm_call_data_t *call_data);
+int cm_call_data_free(cm_call_data_call_data);
 
 
 /**
@@ -299,7 +298,7 @@ int cm_call_data_free(cm_call_data_t *call_data);
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_id(cm_call_data_t *call_data, unsigned int *call_id);
+int cm_call_data_get_call_id(cm_call_data_call_data, unsigned int *call_id);
 
 
 /**
@@ -321,7 +320,7 @@ int cm_call_data_get_call_id(cm_call_data_t *call_data, unsigned int *call_id);
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_direction(cm_call_data_t *call_data, cm_call_direction_e *call_direction);
+int cm_call_data_get_call_direction(cm_call_data_call_data, cm_call_direction_e *call_direction);
 
 
 /**
@@ -343,7 +342,7 @@ int cm_call_data_get_call_direction(cm_call_data_t *call_data, cm_call_direction
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_number(cm_call_data_t *call_data, char **call_number);
+int cm_call_data_get_call_number(cm_call_data_call_data, char **call_number);
 
 
 /**
@@ -365,7 +364,7 @@ int cm_call_data_get_call_number(cm_call_data_t *call_data, char **call_number);
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_calling_name(cm_call_data_t *call_data, char **calling_name);
+int cm_call_data_get_calling_name(cm_call_data_call_data, char **calling_name);
 
 
 /**
@@ -387,7 +386,7 @@ int cm_call_data_get_calling_name(cm_call_data_t *call_data, char **calling_name
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_type(cm_call_data_t *call_data, cm_call_type_e *call_type);
+int cm_call_data_get_call_type(cm_call_data_call_data, cm_call_type_e *call_type);
 
 
 /**
@@ -409,7 +408,7 @@ int cm_call_data_get_call_type(cm_call_data_t *call_data, cm_call_type_e *call_t
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_state(cm_call_data_t *call_data, cm_call_state_e *call_state);
+int cm_call_data_get_call_state(cm_call_data_call_data, cm_call_state_e *call_state);
 
 
 /**
@@ -431,7 +430,7 @@ int cm_call_data_get_call_state(cm_call_data_t *call_data, cm_call_state_e *call
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_call_domain(cm_call_data_t *call_data, cm_call_domain_e *call_domain);
+int cm_call_data_get_call_domain(cm_call_data_call_data, cm_call_domain_e *call_domain);
 
 
 /**
@@ -451,7 +450,7 @@ int cm_call_data_get_call_domain(cm_call_data_t *call_data, cm_call_domain_e *ca
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_data_get_name_mode(cm_call_data_t *call_data, cm_name_mode_e *name_mode);
+int cm_call_data_get_name_mode(cm_call_data_h call_data, cm_call_name_mode_e *name_mode);
 
 
 /**
@@ -473,7 +472,7 @@ int cm_call_data_get_name_mode(cm_call_data_t *call_data, cm_name_mode_e *name_m
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_sim_slot(cm_call_event_data_t *call_event_data, cm_multi_sim_slot_type_e *sim_slot);
+int cm_call_event_data_get_sim_slot(cm_call_event_data_call_event_data, cm_multi_sim_slot_type_e *sim_slot);
 
 
 /**
@@ -495,7 +494,7 @@ int cm_call_event_data_get_sim_slot(cm_call_event_data_t *call_event_data, cm_mu
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_incom_call(cm_call_event_data_t *call_event_data, cm_call_data_t **incom_call);
+int cm_call_event_data_get_incom_call(cm_call_event_data_h call_event_data, cm_call_data_h *incom_call);
 
 
 /**
@@ -517,7 +516,7 @@ int cm_call_event_data_get_incom_call(cm_call_event_data_t *call_event_data, cm_
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_call_id(cm_call_event_data_t *call_event_data, unsigned int *call_id);
+int cm_call_event_data_get_call_id(cm_call_event_data_call_event_data, unsigned int *call_id);
 
 
 /**
@@ -539,7 +538,7 @@ int cm_call_event_data_get_call_id(cm_call_event_data_t *call_event_data, unsign
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_active_call(cm_call_event_data_t *call_event_data, cm_call_data_t **active_call);
+int cm_call_event_data_get_active_call(cm_call_event_data_h call_event_data, cm_call_data_h *active_call);
 
 
 /**
@@ -561,7 +560,7 @@ int cm_call_event_data_get_active_call(cm_call_event_data_t *call_event_data, cm
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_held_call(cm_call_event_data_t *call_event_data, cm_call_data_t **held_call);
+int cm_call_event_data_get_held_call(cm_call_event_data_h call_event_data, cm_call_data_h *held_call);
 
 
 /**
@@ -583,7 +582,7 @@ int cm_call_event_data_get_held_call(cm_call_event_data_t *call_event_data, cm_c
  * @retval #CM_ERROR_NOT_SUPPORTED Operation is Not supported
  *
  */
-int cm_call_event_data_get_end_cause(cm_call_event_data_t *call_event_data, cm_call_end_cause_type_e *end_cause);
+int cm_call_event_data_get_end_cause(cm_call_event_data_call_event_data, cm_call_end_cause_type_e *end_cause);
 
 
 /**
index d596c2e70529263833bfff164d2146b1dafa55e4..8853f136e5b0d49bdc554b74f8fa523f63413e1d 100644 (file)
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 0
-%define patchlevel 11
+%define patchlevel 12
 %define ext_feature 0
 
 Name:           libcall-manager
index 6da0be11c3e225d6e148334e132dc381ccd476d6..f3e380e5236416a4667407c0e152a35723da548c 100644 (file)
@@ -31,7 +31,7 @@
 #include "call-manager-extension.h"
 #include "call-manager-common.h"
 
-static int __cm_fetch_call_data(GVariantIter *iter, cm_call_data_t **call_data);
+static int __cm_fetch_call_data(GVariantIter *iter, cm_call_data_*call_data);
 static void __cm_on_signal_recv(GDBusConnection *conn, const gchar *name,
                const gchar *path, const gchar *interface, const gchar *sig,
                GVariant *param, gpointer user_data);
@@ -63,15 +63,15 @@ static void __cm_set_LCDtimeout_cb(GObject *source_object, GAsyncResult *res, gp
 }
 
 
-static int __cm_fetch_call_data(GVariantIter *iter, cm_call_data_t **call_data)
+static int __cm_fetch_call_data(GVariantIter *iter, cm_call_data_*call_data)
 {
-       cm_call_data_t *tmp_call_data = NULL;
+       cm_call_data_tmp_call_data = NULL;
        gchar *key = 0;
        GVariant *value = 0;
        CM_RETURN_VAL_IF_FAIL(iter, -1);
        CM_RETURN_VAL_IF_FAIL(call_data, -1);
 
-       tmp_call_data = (cm_call_data_t*)calloc(1, sizeof(cm_call_data_t));
+       tmp_call_data = (cm_call_data_h)calloc(1, sizeof(struct __cm_call_data));
        CM_RETURN_VAL_IF_FAIL(tmp_call_data, -1);
 
        while (g_variant_iter_loop(iter, "{sv}", &key, &value)) {
@@ -188,11 +188,11 @@ static void __cm_on_signal_recv(GDBusConnection *conn, const gchar *name,
        } else if (!g_strcmp0(sig, DBUS_CALL_MANAGER_SIGNAL_CALL_EVENT)) {
                const gchar *param_type;
                gint event = -1;
-               cm_call_event_data_t *evt_data = NULL;
-               cm_multi_sim_slot_type_e sim_slot = CM_SIM_SLOT_DEFAULT_E;
-               cm_call_end_cause_type_e end_cause = CM_CALL_ENDCAUSE_MAX;
+               cm_call_event_data_evt_data = NULL;
+               cm_multi_sim_slot_type_e sim_slot = CM_MULTI_SIM_SLOT_DEFAULT;
+               cm_call_end_cause_type_e end_cause = CM_CALL_END_CAUSE_CALL_ENDED;
                unsigned int call_id = 0;
-               cm_call_data_t *callData = NULL;
+               cm_call_data_callData = NULL;
                GVariantIter *iter_incom = 0, *iter_active_dial = 0, *iter_held = 0;
 
                param_type = g_variant_get_type_string(param);
@@ -200,7 +200,7 @@ static void __cm_on_signal_recv(GDBusConnection *conn, const gchar *name,
                g_variant_get(param, "(iuiia{sv}a{sv}a{sv})", &event, &call_id, &sim_slot, &end_cause, &iter_incom, &iter_active_dial, &iter_held);
                dbg("received event: '%d'", event);
 
-               evt_data = calloc(1, sizeof(cm_call_event_data_t));
+               evt_data = calloc(1, sizeof(struct __cm_call_event_data));
                if (NULL == evt_data) {
                        err("memory allocation failed...");
                        g_variant_iter_free(iter_incom);
@@ -1457,7 +1457,7 @@ EXPORT_API int cm_get_all_call_list(cm_client_h handle, GSList **call_list)
        GVariant *dbus_result;
        GError *error = NULL;
        const gchar *param_type;
-       cm_call_data_t *callData = NULL;
+       cm_call_data_callData = NULL;
        GVariantIter *iter = 0, *iter_row = 0;
        int ret = -1;
        dbg("cm_get_all_calllist()");
@@ -1564,7 +1564,7 @@ EXPORT_API int cm_get_conference_call_list(cm_client_h handle, GSList **call_lis
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_get_all_calldata(cm_client_h handle, cm_call_data_t **incom, cm_call_data_t **active, cm_call_data_t **held)
+EXPORT_API int cm_get_all_calldata(cm_client_h handle, cm_call_data_h *incom, cm_call_data_h *active, cm_call_data_h *held)
 {
        GVariant *dbus_result;
        GError *error = NULL;
@@ -1788,7 +1788,7 @@ EXPORT_API int cm_unset_foreground_cb(cm_client_h handle)
        return __cm_unset_cb(handle, DBUS_CALL_MANAGER_SIGNAL_GO_FOREGROUND);
 }
 
-EXPORT_API int cm_call_data_free(cm_call_data_t *call_data)
+EXPORT_API int cm_call_data_free(cm_call_data_call_data)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        g_free(call_data->call_number);
@@ -1798,7 +1798,7 @@ EXPORT_API int cm_call_data_free(cm_call_data_t *call_data)
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_id(cm_call_data_t *call_data, unsigned int *call_id)
+EXPORT_API int cm_call_data_get_call_id(cm_call_data_call_data, unsigned int *call_id)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_id, CM_ERROR_INVALID_PARAMETER);
@@ -1807,7 +1807,7 @@ EXPORT_API int cm_call_data_get_call_id(cm_call_data_t *call_data, unsigned int
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_direction(cm_call_data_t *call_data, cm_call_direction_e *call_direction)
+EXPORT_API int cm_call_data_get_call_direction(cm_call_data_call_data, cm_call_direction_e *call_direction)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_direction, CM_ERROR_INVALID_PARAMETER);
@@ -1816,7 +1816,7 @@ EXPORT_API int cm_call_data_get_call_direction(cm_call_data_t *call_data, cm_cal
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_number(cm_call_data_t *call_data, char **call_number)
+EXPORT_API int cm_call_data_get_call_number(cm_call_data_call_data, char **call_number)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_number, CM_ERROR_INVALID_PARAMETER);
@@ -1825,7 +1825,7 @@ EXPORT_API int cm_call_data_get_call_number(cm_call_data_t *call_data, char **ca
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_calling_name(cm_call_data_t *call_data, char **calling_name)
+EXPORT_API int cm_call_data_get_calling_name(cm_call_data_call_data, char **calling_name)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(calling_name, CM_ERROR_INVALID_PARAMETER);
@@ -1834,7 +1834,7 @@ EXPORT_API int cm_call_data_get_calling_name(cm_call_data_t *call_data, char **c
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_type(cm_call_data_t *call_data, cm_call_type_e *call_type)
+EXPORT_API int cm_call_data_get_call_type(cm_call_data_call_data, cm_call_type_e *call_type)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_type, CM_ERROR_INVALID_PARAMETER);
@@ -1843,7 +1843,7 @@ EXPORT_API int cm_call_data_get_call_type(cm_call_data_t *call_data, cm_call_typ
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_state(cm_call_data_t *call_data, cm_call_state_e *call_state)
+EXPORT_API int cm_call_data_get_call_state(cm_call_data_call_data, cm_call_state_e *call_state)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_state, CM_ERROR_INVALID_PARAMETER);
@@ -1852,7 +1852,7 @@ EXPORT_API int cm_call_data_get_call_state(cm_call_data_t *call_data, cm_call_st
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_domain(cm_call_data_t *call_data, cm_call_domain_e *call_domain)
+EXPORT_API int cm_call_data_get_call_domain(cm_call_data_call_data, cm_call_domain_e *call_domain)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_domain, CM_ERROR_INVALID_PARAMETER);
@@ -1861,7 +1861,7 @@ EXPORT_API int cm_call_data_get_call_domain(cm_call_data_t *call_data, cm_call_d
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_person_id(cm_call_data_t *call_data, int *person_id)
+EXPORT_API int cm_call_data_get_person_id(cm_call_data_call_data, int *person_id)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(person_id, CM_ERROR_INVALID_PARAMETER);
@@ -1870,7 +1870,7 @@ EXPORT_API int cm_call_data_get_person_id(cm_call_data_t *call_data, int *person
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_call_member_count(cm_call_data_t *call_data, int *member_count)
+EXPORT_API int cm_call_data_get_call_member_count(cm_call_data_call_data, int *member_count)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(member_count, CM_ERROR_INVALID_PARAMETER);
@@ -1879,7 +1879,7 @@ EXPORT_API int cm_call_data_get_call_member_count(cm_call_data_t *call_data, int
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_is_emergency_call(cm_call_data_t *call_data, gboolean *is_emergency)
+EXPORT_API int cm_call_data_is_emergency_call(cm_call_data_call_data, gboolean *is_emergency)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_emergency, CM_ERROR_INVALID_PARAMETER);
@@ -1888,7 +1888,7 @@ EXPORT_API int cm_call_data_is_emergency_call(cm_call_data_t *call_data, gboolea
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_is_voicemail_number(cm_call_data_t *call_data, gboolean *is_voicemail_number)
+EXPORT_API int cm_call_data_is_voicemail_number(cm_call_data_call_data, gboolean *is_voicemail_number)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_voicemail_number, CM_ERROR_INVALID_PARAMETER);
@@ -1897,7 +1897,7 @@ EXPORT_API int cm_call_data_is_voicemail_number(cm_call_data_t *call_data, gbool
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_start_time(cm_call_data_t *call_data, long *start_time)
+EXPORT_API int cm_call_data_get_start_time(cm_call_data_call_data, long *start_time)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(start_time, CM_ERROR_INVALID_PARAMETER);
@@ -1906,7 +1906,7 @@ EXPORT_API int cm_call_data_get_start_time(cm_call_data_t *call_data, long *star
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_name_mode(cm_call_data_t *call_data, cm_name_mode_e *name_mode)
+EXPORT_API int cm_call_data_get_name_mode(cm_call_data_h call_data, cm_call_name_mode_e *name_mode)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(name_mode, CM_ERROR_INVALID_PARAMETER);
@@ -1915,7 +1915,7 @@ EXPORT_API int cm_call_data_get_name_mode(cm_call_data_t *call_data, cm_name_mod
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_session_id(cm_call_data_t *call_data, int *session_id)
+EXPORT_API int cm_call_data_get_session_id(cm_call_data_call_data, int *session_id)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(session_id, CM_ERROR_INVALID_PARAMETER);
@@ -1924,7 +1924,7 @@ EXPORT_API int cm_call_data_get_session_id(cm_call_data_t *call_data, int *sessi
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_hd_icon_state(cm_call_data_t *call_data, int *is_hd_enable)
+EXPORT_API int cm_call_data_get_hd_icon_state(cm_call_data_call_data, int *is_hd_enable)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_hd_enable, CM_ERROR_INVALID_PARAMETER);
@@ -1933,7 +1933,7 @@ EXPORT_API int cm_call_data_get_hd_icon_state(cm_call_data_t *call_data, int *is
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_is_wifi_calling(cm_call_data_t *call_data, int *is_wifi_calling)
+EXPORT_API int cm_call_data_get_is_wifi_calling(cm_call_data_call_data, int *is_wifi_calling)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_wifi_calling, CM_ERROR_INVALID_PARAMETER);
@@ -1942,7 +1942,7 @@ EXPORT_API int cm_call_data_get_is_wifi_calling(cm_call_data_t *call_data, int *
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_upgrade_downgrade_state(cm_call_data_t *call_data, int *is_upgrade_downgrade_enable)
+EXPORT_API int cm_call_data_get_upgrade_downgrade_state(cm_call_data_call_data, int *is_upgrade_downgrade_enable)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_upgrade_downgrade_enable, CM_ERROR_INVALID_PARAMETER);
@@ -1951,7 +1951,7 @@ EXPORT_API int cm_call_data_get_upgrade_downgrade_state(cm_call_data_t *call_dat
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_is_added_to_conf(cm_call_data_t *call_data, int *is_added_to_conf)
+EXPORT_API int cm_call_data_get_is_added_to_conf(cm_call_data_call_data, int *is_added_to_conf)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_added_to_conf, CM_ERROR_INVALID_PARAMETER);
@@ -1960,7 +1960,7 @@ EXPORT_API int cm_call_data_get_is_added_to_conf(cm_call_data_t *call_data, int
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_data_get_is_remote_on_hold(cm_call_data_t *call_data, int *is_remote_on_hold)
+EXPORT_API int cm_call_data_get_is_remote_on_hold(cm_call_data_call_data, int *is_remote_on_hold)
 {
        CM_RETURN_VAL_IF_FAIL(call_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(is_remote_on_hold, CM_ERROR_INVALID_PARAMETER);
@@ -1969,7 +1969,7 @@ EXPORT_API int cm_call_data_get_is_remote_on_hold(cm_call_data_t *call_data, int
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_call_id(cm_call_event_data_t *call_event_data, unsigned int *call_id)
+EXPORT_API int cm_call_event_data_get_call_id(cm_call_event_data_call_event_data, unsigned int *call_id)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(call_id, CM_ERROR_INVALID_PARAMETER);
@@ -1977,7 +1977,7 @@ EXPORT_API int cm_call_event_data_get_call_id(cm_call_event_data_t *call_event_d
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_sim_slot(cm_call_event_data_t *call_event_data, cm_multi_sim_slot_type_e *sim_slot)
+EXPORT_API int cm_call_event_data_get_sim_slot(cm_call_event_data_call_event_data, cm_multi_sim_slot_type_e *sim_slot)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(sim_slot, CM_ERROR_INVALID_PARAMETER);
@@ -1985,7 +1985,7 @@ EXPORT_API int cm_call_event_data_get_sim_slot(cm_call_event_data_t *call_event_
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_end_cause(cm_call_event_data_t *call_event_data, cm_call_end_cause_type_e *end_cause)
+EXPORT_API int cm_call_event_data_get_end_cause(cm_call_event_data_call_event_data, cm_call_end_cause_type_e *end_cause)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(end_cause, CM_ERROR_INVALID_PARAMETER);
@@ -1993,7 +1993,7 @@ EXPORT_API int cm_call_event_data_get_end_cause(cm_call_event_data_t *call_event
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_incom_call(cm_call_event_data_t *call_event_data, cm_call_data_t **incom_call)
+EXPORT_API int cm_call_event_data_get_incom_call(cm_call_event_data_h call_event_data, cm_call_data_h *incom_call)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(incom_call, CM_ERROR_INVALID_PARAMETER);
@@ -2001,7 +2001,7 @@ EXPORT_API int cm_call_event_data_get_incom_call(cm_call_event_data_t *call_even
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_active_call(cm_call_event_data_t *call_event_data, cm_call_data_t **active_call)
+EXPORT_API int cm_call_event_data_get_active_call(cm_call_event_data_h call_event_data, cm_call_data_h *active_call)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(active_call, CM_ERROR_INVALID_PARAMETER);
@@ -2009,7 +2009,7 @@ EXPORT_API int cm_call_event_data_get_active_call(cm_call_event_data_t *call_eve
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_call_event_data_get_held_call(cm_call_event_data_t *call_event_data, cm_call_data_t **held_call)
+EXPORT_API int cm_call_event_data_get_held_call(cm_call_event_data_h call_event_data, cm_call_data_h *held_call)
 {
        CM_RETURN_VAL_IF_FAIL(call_event_data, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(held_call, CM_ERROR_INVALID_PARAMETER);
@@ -2044,7 +2044,7 @@ EXPORT_API int cm_conf_call_data_get_person_id(cm_conf_call_data_t *conf_call, i
        return CM_ERROR_NONE;
 }
 
-EXPORT_API int cm_conf_call_data_get_name_mode(cm_conf_call_data_t *conf_call, cm_name_mode_e *name_mode)
+EXPORT_API int cm_conf_call_data_get_name_mode(cm_conf_call_data_t *conf_call, cm_call_name_mode_e *name_mode)
 {
        CM_RETURN_VAL_IF_FAIL(conf_call, CM_ERROR_INVALID_PARAMETER);
        CM_RETURN_VAL_IF_FAIL(name_mode, CM_ERROR_INVALID_PARAMETER);
index 8f9a140ba8212414e1cb073b86311ce155ea0c9d..33d27ab4de980c63876948e3fee58f59a600665e 100644 (file)
@@ -61,7 +61,7 @@ static void __mute_status_changed_cb(cm_mute_status_e mute_status, void *user_da
        return;
 }
 
-static void __call_event_changed_cb(cm_call_event_e call_event, cm_call_event_data_t* event_data, void *user_data)
+static void __call_event_changed_cb(cm_call_event_e call_event, cm_call_event_data_h event_data, void *user_data)
 {
        g_print("====> Call event changed!!!!<====\n");
        g_print("====>Event_id: %d\n", call_event);
@@ -71,9 +71,9 @@ static void __call_event_changed_cb(cm_call_event_e call_event, cm_call_event_da
                {
                        cm_multi_sim_slot_type_e sim_slot = 0;
                        unsigned int call_id = 0;
-                       cm_call_data_t *incom_call = NULL;
-                       cm_call_data_t *active_call = NULL;
-                       cm_call_data_t *held_call = NULL;
+                       cm_call_data_incom_call = NULL;
+                       cm_call_data_active_call = NULL;
+                       cm_call_data_held_call = NULL;
 
                        cm_call_event_data_get_sim_slot(event_data, &sim_slot);
                        g_print("sim_slot: %d\n", sim_slot);
@@ -86,7 +86,7 @@ static void __call_event_changed_cb(cm_call_event_e call_event, cm_call_event_da
                }
                case CM_CALL_EVENT_IDLE:
                {
-                       cm_call_end_cause_type_e end_cause = CM_CALL_ENDCAUSE_MAX;
+                       cm_call_end_cause_type_e end_cause = CM_CALL_END_CAUSE_CALL_ENDED;
                        cm_call_event_data_get_end_cause(event_data, &end_cause);
                        g_print("end_cause: %d\n", end_cause);
                }
@@ -141,7 +141,7 @@ static void __print_conf_call_data(cm_conf_call_data_t* call_data)
        unsigned int call_id;
        char *call_number = NULL;
        int person_id;
-       cm_name_mode_e name_mode;
+       cm_call_name_mode_e name_mode;
        cm_conf_call_data_get_call_id(call_data, &call_id);
        cm_conf_call_data_get_call_number(call_data, &call_number);
        cm_conf_call_data_get_person_id(call_data, &person_id);
@@ -154,7 +154,7 @@ static void __print_conf_call_data(cm_conf_call_data_t* call_data)
        return;
 }
 
-static void __print_call_data(cm_call_data_t* call_data)
+static void __print_call_data(cm_call_data_h call_data)
 {
        if (call_data == NULL) {
                g_print("call data is NULL\n");
@@ -308,7 +308,7 @@ static gboolean __process_input(gchar * buffer)
                                g_print("!!!!!!!!!!!!!!!!Enter dial number!!!!!!!!!!!!!!!!!!!!!\n");
                        } else {
                                g_print(">>>>>>Dial to %s\n", strsplits[1]);
-                               cm_dial_call(cm_handle, strsplits[1], CM_CALL_TYPE_VOICE, CM_SIM_SLOT_DEFAULT_E);
+                               cm_dial_call(cm_handle, strsplits[1], CM_CALL_TYPE_VOICE, CM_MULTI_SIM_SLOT_DEFAULT);
                        }
                } else {
                        g_print("!!!!!!!!!!!!!!!!Not initialized!!!!!!!!!!!!!!!!!!!!!\n");
@@ -319,7 +319,7 @@ static gboolean __process_input(gchar * buffer)
                                g_print("!!!!!!!!!!!!!!!!Enter dial number!!!!!!!!!!!!!!!!!!!!!\n");
                        } else {
                                g_print(">>>>>>Dial to %s\n", strsplits[1]);
-                               cm_dial_call(cm_handle, strsplits[1], CM_CALL_TYPE_VIDEO, CM_SIM_SLOT_DEFAULT_E);
+                               cm_dial_call(cm_handle, strsplits[1], CM_CALL_TYPE_VIDEO, CM_MULTI_SIM_SLOT_DEFAULT);
                        }
                } else {
                        g_print("!!!!!!!!!!!!!!!!Not initialized!!!!!!!!!!!!!!!!!!!!!\n");
@@ -331,7 +331,7 @@ static gboolean __process_input(gchar * buffer)
                        } else {
                                unsigned int call_id = strtoul(strsplits[1], NULL, 10);
                                g_print(">>>>>>End call %d\n", call_id);
-                               cm_end_call(cm_handle, call_id, CALL_RELEASE_TYPE_BY_CALL_HANDLE);
+                               cm_end_call(cm_handle, call_id, CM_CALL_RELEASE_TYPE_BY_CALL_HANDLE);
                        }
                } else {
                        g_print("!!!!!!!!!!!!!!!!Not initialized!!!!!!!!!!!!!!!!!!!!!\n");
@@ -573,9 +573,9 @@ static gboolean __process_input(gchar * buffer)
                                g_print("all call list is NULL!\n");
                        else {
                                int idx;
-                               cm_call_data_t *callData = NULL;
+                               cm_call_data_callData = NULL;
                                for (idx = 0; idx < list_len; idx++) {
-                                       callData = (cm_call_data_t *)g_slist_nth_data(list, idx);
+                                       callData = (cm_call_data_h)g_slist_nth_data(list, idx);
                                        __print_call_data(callData);
                                        cm_call_data_free(callData);
                                }
@@ -604,9 +604,9 @@ static gboolean __process_input(gchar * buffer)
                }
        } else if ((g_strcmp0(strsplits[0], "38") == 0) || (g_strcmp0(strsplits[0], "getallcalldata") == 0)) {
                if (cm_handle) {
-                       cm_call_data_t *incom = NULL;
-                       cm_call_data_t *active = NULL;
-                       cm_call_data_t *held = NULL;
+                       cm_call_data_incom = NULL;
+                       cm_call_data_active = NULL;
+                       cm_call_data_held = NULL;
                        cm_get_all_calldata(cm_handle, &incom, &active, &held);
                        g_print("incom call data:\n");
                        __print_call_data(incom);