Sync with the tizen 2.4

Change-Id: I8dbf662a4357161b80f1d910659a2378eb1be550

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 681f86d..717cc4b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"WIDGET_SERVICE\"")
 ADD_DEFINITIONS("-DNDEBUG")
 ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
-ADD_DEFINITIONS("-DSERVICE_SOCKET=\"/opt/usr/share/live_magazine/.service.socket\"")
+ADD_DEFINITIONS("-DSERVICE_SOCKET=\"/tmp/.data-provider-master-service.socket\"")
 ADD_DEFINITIONS("-DRESOLUTION_FILE=\"/usr/share/data-provider-master/resolution.ini\"")
 ADD_DEFINITIONS("-DDB_FILE=\"/opt/dbspace/.widget.db\"")
 ADD_DEFINITIONS("-DDEFAULT_MASTER_CONF=\"/usr/share/data-provider-master/conf.ini\"")

diff --git a/include/widget_cmd_list.h b/include/widget_cmd_list.h
index a9249f1..42746c9 100644 (file)
--- a/include/widget_cmd_list.h
+++ b/include/widget_cmd_list.h
@@ -411,6 +411,20 @@ extern "C" {
 #define CMD_STR_MONITOR_PAUSE   "monitor_pause"
 #define CMD_STR_MONITOR_RESUME  "monitor_resume"
 
+/**
+ * @internal
+ * @brief Viewer to Master (Shared FD)
+ */
+#define CMD_DIRECT_HELLO       0x00000001
+#define CMD_STR_DIRECT_HELLO       "direct_hello"
+
+/**
+ * @internal
+ * @brief Provider to Master (Shared FD)
+ */
+#define CMD_DIRECT_CONNECTED 0x00000101
+#define CMD_STR_DIRECT_CONNECTED "direct_connected"
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/widget_service.h b/include/widget_service.h
index a8ef253..435fd67 100644 (file)
--- a/include/widget_service.h
+++ b/include/widget_service.h
@@ -494,7 +494,7 @@ typedef enum widget_lifecycle_event {
 
 /**
  * @brief Called when a widget is created or destroyed
- * @since_tizen 2.3.
+ * @since_tizen 2.3.1
  * @param[in] widget_id appid of widget application
  * @param[in] lifecycle_event type of event
  * @param[in] widget_instance_id widget instance id

diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec
index ea46aa2..61260e5 100644 (file)
--- a/packaging/libwidget_service.spec
+++ b/packaging/libwidget_service.spec
@@ -2,7 +2,7 @@
 
 Name: libwidget_service
 Summary: Service API for gathering installed widget information
-Version: 1.1.2
+Version: 1.1.3
 Release: 1
 Group: Applications/Core Applications
 License: Flora-1.1