Merge "Modify callback(name and parameter) and Remove unused return value" into tizen

diff --cc include/ttse.h
Simple merge

diff --cc server/ttsd_server.c
Simple merge

diff --cc server/ttsd_server.h
index 4853328,fbdaf92..e4aa647
--- 1/server/ttsd_server.h
--- 2/server/ttsd_server.h
+++ b/server/ttsd_server.h
@@@ -43,9 -43,9 +43,9 @@@ int ttsd_set_private_data_requested_cb(
  int ttsd_get_activated_mode(int* activated_mode);
  int ttsd_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback);
  
- int ttsd_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback);
+ int ttsd_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback, void* user_data);
  
 -int ttsd_send_personal_voice(const char* language, const char* unique_id, const char* display_name, const char* device_name, void* user_data);
 +int ttsd_send_personal_voice(const char* language, const char* unique_id, const char* display_name, const char* device_name);
  
  
  /*

diff --cc server/ttse.c
Simple merge