upload tizen1.0 source

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0974818..b41e264 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(PROJECT_RELEASE_VERSION "1")
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 add_definitions(-Wall -O3 -omit-frame-pointer) 
-add_definitions(-Wall -g -D_DEBUG)
+#add_definitions(-Wall -g -D_DEBUG)
 
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")

diff --git a/debian/changelog b/debian/changelog
index 212c4fa..0262598 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sensor-framework (0.2.5-47) unstable; urgency=low
+
+  * version sync
+  * Git: 165.213.180.114:/pkgs/s/sensor-framework
+  * Tag: sensor-framework_0.2.5-47
+
+ -- JuHyun Kim <jh8212.kim@samsung.com>  Fri, 13 Apr 2012 09:37:36 +0900
+
 sensor-framework (0.2.5-37) unstable; urgency=low
 
   * version sync

diff --git a/packaging/sensor-framework.spec b/packaging/sensor-framework.spec
index 47ee094..a7a3e68 100644 (file)
--- a/packaging/sensor-framework.spec
+++ b/packaging/sensor-framework.spec
@@ -1,6 +1,6 @@
 Name:       sensor-framework
 Summary:    Sensor framework
-Version:       0.2.5
+Version: 0.2.5
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPL
@@ -27,13 +27,6 @@ make %{?jobs:-j%jobs}
 %make_install
 
 %post 
-mkdir -p /etc/rc.d/rc3.d/
-mkdir -p /etc/rc.d/rc4.d/
-ln -s ../init.d/sfsvc /etc/rc.d/rc3.d/S40sfsvc
-ln -s ../init.d/sfsvc /etc/rc.d/rc4.d/S40sfsvc
-
-
-
 vconftool set -t int memory/sensor/10001 0 -i
 vconftool set -t int memory/sensor/10002 0 -i
 vconftool set -t int memory/sensor/10004 0 -i
@@ -54,7 +47,17 @@ vconftool set -t int memory/sensor/800040 0 -i
 vconftool set -t int memory/sensor/80001 0 -i
 vconftool set -t int memory/sensor/80002 0 -i
 
+mkdir -p /etc/rc.d/rc3.d
+mkdir -p /etc/rc.d/rc4.d
+ln -s /etc/rc.d/init.d/sfsvc /etc/rc.d/rc3.d/S40sfsvc
+ln -s /etc/rc.d/init.d/sfsvc /etc/rc.d/rc4.d/S40sfsvc
+
+%postun
+rm -f /etc/rc.d/rc3.d/S40sfsvc
+rm -f /etc/rc.d/rc4.d/S40sfsvc
+
 %files
+%defattr(-,root,root,-)
 /usr/bin/sf_server
 %{_sysconfdir}/rc.d/init.d/sfsvc
 %attr(0644,root,root)/usr/etc/sf_data_stream.conf

diff --git a/server/src/cserver.cpp b/server/src/cserver.cpp
index 7d69a83..053fb32 100755 (executable)
--- a/server/src/cserver.cpp
+++ b/server/src/cserver.cpp
@@ -69,7 +69,7 @@
 #include <resource_str.h>
 
 #include <glib.h>
-
+#include <vconf.h>
 
 cserver::cserver()
 {
@@ -819,12 +819,14 @@ void *cserver::cmd_get_property(void *cmd_item, void *data)
                
        base_property_struct return_base_property;
 
+       memset(&return_base_property, '\0', sizeof(return_base_property));
+
        if (arg->worker->state() != cipc_worker::START) {
                ERR("Client disconnected (%s)\n",__FUNCTION__);
                return (void*)NULL;
        }
 
-       DBG("CMD_SET_VALUE  Handler invoked\n");
+       DBG("CMD_GET_PROPERTY Handler invoked\n");
 
        payload = (cmd_get_property_t*)packet->data();
        get_property_level =  payload->get_level;
@@ -839,15 +841,13 @@ void *cserver::cmd_get_property(void *cmd_item, void *data)
                cdata_stream *data_stream;
                data_stream = (cdata_stream*)ctx->module;
 
-               if ( (get_property_level & 0xFFFF) == 1 ) {                     
-                       get_property_size = sizeof(base_property_struct);
-                       state = data_stream->get_property(get_property_level, (void*)&return_base_property);
-                       if ( state != 0 ) {
-                               ERR("data_stream get_property fail");
-                               goto out;
-                       }
-                       return_property_struct = (void*)&return_base_property;
+               get_property_size = sizeof(base_property_struct);
+               state = data_stream->get_property(get_property_level, (void*)&return_base_property);
+               if ( state != 0 ) {
+                       ERR("data_stream get_property fail");
+                       goto out;
                }
+               return_property_struct = (void*)&return_base_property;
        }
 
 out:
@@ -1259,6 +1259,9 @@ void cserver::sf_main_loop(void)
        ipc->set_worker(cb_ipc_start, cb_ipc_worker, cb_ipc_stop);
        ipc->wait_for_client();
         
+       vconf_set_int ("memory/hibernation/sfsvc_ready", 1);
+
+
        g_main_loop_run(mainloop);
     g_main_loop_unref(mainloop);       
        

diff --git a/server/src/main.cpp b/server/src/main.cpp
index aab70b2..06f1f0c 100644 (file)
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -72,7 +72,6 @@
 
 #include <resource_str.h>
 
-#include <vconf.h>
 
 #if !defined(PATH_MAX)
 #define PATH_MAX 256
@@ -317,8 +316,6 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       vconf_set_int ("memory/hibernation/sfsvc_ready", 1);
-
        server.sf_main_loop();
 
        if (processor_catalog) {