summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryoungsub ko <ys4610.ko@samsung.com>2013-04-09 20:29:11 +0900
committeryoungsub ko <ys4610.ko@samsung.com>2013-04-09 20:29:11 +0900
commitc4ff8516b3ea52f4d812e18f31981460b22d9162 (patch)
treed10e2d7efcc13fa39983715556cae0ce3102acba
parentb308071cc0ef1b4249b8ae2345d3c0a87ab8adfd (diff)
downloadminicontrol-c4ff8516b3ea52f4d812e18f31981460b22d9162.tar.gz
minicontrol-c4ff8516b3ea52f4d812e18f31981460b22d9162.tar.bz2
minicontrol-c4ff8516b3ea52f4d812e18f31981460b22d9162.zip
sync with private git
-rwxr-xr-xinclude/minicontrol-monitor.h7
-rwxr-xr-xinclude/minicontrol-provider.h7
-rwxr-xr-xinclude/minicontrol-viewer.h7
-rwxr-xr-xpackaging/minicontrol.spec2
-rwxr-xr-xsrc/minicontrol-provider.c1
5 files changed, 23 insertions, 1 deletions
diff --git a/include/minicontrol-monitor.h b/include/minicontrol-monitor.h
index 496bbb1..74d19ee 100755
--- a/include/minicontrol-monitor.h
+++ b/include/minicontrol-monitor.h
@@ -20,6 +20,10 @@
#include <minicontrol-error.h>
#include <minicontrol-type.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* @defgroup MINICONTROL_MONITOR_LIBRARY minicontrol monitor library
* @brief This minicontrol monitor library used to manage events triggered by minicontrol provider
@@ -75,5 +79,8 @@ minicontrol_error_e minicontrol_monitor_start(minicontrol_monitor_cb callback,
*/
minicontrol_error_e minicontrol_monitor_stop(void);
+#ifdef __cplusplus
+}
+#endif
#endif /* _MINICTRL_MONITOR_H_ */
diff --git a/include/minicontrol-provider.h b/include/minicontrol-provider.h
index 8a543a1..2aa8865 100755
--- a/include/minicontrol-provider.h
+++ b/include/minicontrol-provider.h
@@ -21,6 +21,10 @@
#include "minicontrol-error.h"
#include "minicontrol-type.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* @defgroup MINICONTROL_PROVIDER_LIBRARY minicontrol provider library
* @brief This minicontrol provider library used to create evas socket window
@@ -46,5 +50,8 @@ Evas_Object *minicontrol_win_add(const char *name);
*/
minicontrol_error_e minicontrol_request(Evas_Object *mincontrol, minicontrol_request_e request);
+#ifdef __cplusplus
+}
+#endif
#endif /* _MINICTRL_PROVIDER_H_ */
diff --git a/include/minicontrol-viewer.h b/include/minicontrol-viewer.h
index ebbd945..2898b03 100755
--- a/include/minicontrol-viewer.h
+++ b/include/minicontrol-viewer.h
@@ -19,6 +19,10 @@
#include <Evas.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* @defgroup MINICONTROL_VIEWER_LIBRARY minicontrol provider library
* @brief This minicontrol viewer library used to display minicontrol which created by minicontrol provider
@@ -44,5 +48,8 @@ Evas_Object *minicontrol_viewer_add(Evas_Object *parent, const char *svr_name);
*/
Evas_Object *minicontrol_viewer_image_object_get(const Evas_Object *obj);
+#ifdef __cplusplus
+}
+#endif
#endif /* _MINICTRL_VIEWER_H_ */
diff --git a/packaging/minicontrol.spec b/packaging/minicontrol.spec
index 0656596..3f30bdb 100755
--- a/packaging/minicontrol.spec
+++ b/packaging/minicontrol.spec
@@ -1,6 +1,6 @@
Name: minicontrol
Summary: minicontrol library
-Version: 0.0.3
+Version: 0.0.6
Release: 1
Group: TBD
License: Flora
diff --git a/src/minicontrol-provider.c b/src/minicontrol-provider.c
index cc4e034..662a310 100755
--- a/src/minicontrol-provider.c
+++ b/src/minicontrol-provider.c
@@ -266,6 +266,7 @@ EXPORT_API Evas_Object *minicontrol_win_add(const char *name)
if (!elm_win_socket_listen(win, name_inter, 0, EINA_FALSE)) {
ERR("Fail to elm win socket listen");
evas_object_del(win);
+ free(name_inter);
return NULL;
}