Merge changes I0deb6ab7,Ib8183f9d into tizen

* changes:
  Fix dbus bug about conn block
  Fix lib path for 64bit

diff --git a/client/vc_dbus.c b/client/vc_dbus.c
index bcf3964..8fdde2a 100644 (file)
--- a/client/vc_dbus.c
+++ b/client/vc_dbus.c
@@ -138,8 +138,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
                        if (dbus_error_is_set(&err)) {
                                SLOG(LOG_ERROR, TAG_VCC, "<<<< vc Get Error message : Get arguments error (%s)", err.message);
                                dbus_error_free(&err);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_DEBUG, TAG_VCC, "<<<< vc Get Error message : pid(%d), reason(%d), msg(%s)", pid, reason, err_msg);
                                __vc_cb_error(pid, reason);
                        }
@@ -147,7 +146,7 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
                        SLOG(LOG_DEBUG, TAG_VCC, "=====");
                        SLOG(LOG_DEBUG, TAG_VCC, " ");
                } /* VCD_METHOD_ERROR */
-               
+
                else {
                        SLOG(LOG_DEBUG, TAG_VCC, "Message is NOT valid");
                        dbus_message_unref(msg);

diff --git a/client/vc_mgr_dbus.c b/client/vc_mgr_dbus.c
index f25cc8a..164e1a4 100644 (file)
--- a/client/vc_mgr_dbus.c
+++ b/client/vc_mgr_dbus.c
@@ -89,8 +89,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                        if (pid > 0) {
                                SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr get hello : pid(%d) ", pid);
                                response = 1;
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr get hello : invalid pid ");
                        }
 
@@ -107,8 +106,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
 
                                dbus_connection_flush(g_m_conn_listener);
                                dbus_message_unref(reply);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr get hello : fail to create reply message");
                        }
 
@@ -219,8 +217,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                        if (dbus_error_is_set(&err)) {
                                SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth enable : Get arguments error (%s)", err.message);
                                dbus_error_free(&err);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr request auth enable : pid(%d)", pid);
                                ret = __vc_mgr_request_auth_enable(pid);
                        }
@@ -238,8 +235,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                                        SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr request auth enable : ret(%d)", ret);
                                dbus_connection_flush(g_m_conn_listener);
                                dbus_message_unref(reply);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth enable : fail to create reply message");
                        }
 
@@ -259,8 +255,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                        if (dbus_error_is_set(&err)) {
                                SLOG(LOG_ERROR, TAG_VCM, "<<<< vc mgr request auth disable : Get arguments error (%s)", err.message);
                                dbus_error_free(&err);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_DEBUG, TAG_VCM, "<<<< vc mgr request auth disable : pid(%d)", pid);
                                ret = __vc_mgr_request_auth_disable(pid);
                        }
@@ -278,8 +273,7 @@ static Eina_Bool vc_mgr_listener_event_callback(void* data, Ecore_Fd_Handler *fd
                                        SLOG(LOG_DEBUG, TAG_VCM, ">>>> vc mgr request auth disable : ret(%d)", ret);
                                dbus_connection_flush(g_m_conn_listener);
                                dbus_message_unref(reply);
-                       }
-                       else {
+                       } else {
                                SLOG(LOG_ERROR, TAG_VCM, ">>>> vc mgr request auth disable : fail to create reply message");
                        }
 

diff --git a/client/vc_widget.c b/client/vc_widget.c
index e8ae87b..ee7c4f2 100644 (file)
--- a/client/vc_widget.c
+++ b/client/vc_widget.c
@@ -1114,8 +1114,7 @@ int __vc_widget_cb_service_state(int state)
                callback((vc_service_state_e)before_state, (vc_service_state_e)current_state, service_user_data);
                vc_widget_client_not_use_callback(g_vc_w);
                SLOG(LOG_DEBUG, TAG_VCW, "Service state changed callback is called");
-       }
-       else {
+       } else {
                SLOG(LOG_WARN, TAG_VCW, "[WARNING] Service state changed callback is null");
        }
 

diff --git a/doc/uix_vc_doc.h b/doc/uix_vc_doc.h
index ac100b1..5cb9861 100644 (file)
--- a/doc/uix_vc_doc.h
+++ b/doc/uix_vc_doc.h
@@ -173,7 +173,7 @@
  * </tr>
  * </table>
  *
- * @section CAPI_UIX_VOICE_CONTROL_MODULE Related Features
+ * @section CAPI_UIX_VOICE_CONTROL_MODULE_FEATURES Related Features
  * This API is related with the following features:<br>
  *  - http://tizen.org/feature/microphone<br>
  *  - http://tizen.org/feature/speech.control<br>
@@ -181,7 +181,7 @@
  * It is recommended to design feature related codes in your application for reliability.<br>
  * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.<br>
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.<br>
- * More details on featuring your application can be found from <a href="../org.tizen.mobile.native.appprogramming/html/ide_sdk_tools/feature_element.htm"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  */
 

diff --git a/include/voice_control.h b/include/voice_control.h
index b751639..8e7b5f3 100644 (file)
--- a/include/voice_control.h
+++ b/include/voice_control.h
@@ -221,7 +221,7 @@ int vc_get_state(vc_state_e* state);
 * @retval #VC_ERROR_PERMISSION_DENIED Permission denied
 * @retval #VC_ERROR_NOT_SUPPORTED Not supported
 *
-* @pre The state should be #VC_STATE_INITIALIZED or #VC_STATE_READY.
+* @pre The state should be #VC_STATE_READY.
 *
 * @see vc_request_start()
 * @see vc_request_stop()