summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2013-03-04 03:32:52 (GMT)
committerSung-jae Park <nicesj.park@samsung.com>2013-03-04 03:32:52 (GMT)
commit7e3f946d3dd7a3cdee72110fe3e3d379c1374746 (patch)
treea1ab2f81e815a1281ae4bcda3ef621f0f3f39a87
parente37f1dfc7ba46b28de6e527a54707aeb2daba4c4 (diff)
downloaddata-provider-master-7e3f946d3dd7a3cdee72110fe3e3d379c1374746.zip
data-provider-master-7e3f946d3dd7a3cdee72110fe3e3d379c1374746.tar.gz
data-provider-master-7e3f946d3dd7a3cdee72110fe3e3d379c1374746.tar.bz2
Replace the package name to data-provider-master
remove prefix "org.tizen." Change-Id: Iece033f79fd5d7793a477ad4f7944f60ba16055f
-rw-r--r--CMakeLists.txt5
-rw-r--r--data-provider-master.desktop (renamed from org.tizen.data-provider-master.desktop)2
-rw-r--r--data-provider-master.manifest (renamed from org.tizen.data-provider-master.manifest)0
-rw-r--r--include/conf.h2
-rw-r--r--packaging/data-provider-master.spec (renamed from packaging/org.tizen.data-provider-master.spec)8
-rw-r--r--src/script_handler.c2
-rw-r--r--src/server.c4
7 files changed, 10 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73584be..1393c21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ pkg_check_modules(pkg REQUIRED
)
SET(PACKAGE "${PROJECT_NAME}")
-#SET(LOCALEDIR "/opt/apps/org.tizen.${PROJECT_NAME}/res/locale")
SET(CMAKE_C_FLAGS "-Wall -fpie -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g")
SET(CMAKE_EXE_LINKER_FLAGS "-pie")
@@ -83,14 +82,12 @@ ADD_EXECUTABLE(${PROJECT_NAME}
)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkg_LDFLAGS} "-ldl")
-#INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-master.desktop DESTINATION /opt/share/applications)
-#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /opt/apps/org.tizen.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/abi.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PRODUCT}.conf.ini DESTINATION /usr/share/data-provider-master RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/resolution.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "org.tizen.${PROJECT_NAME}")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "${PROJECT_NAME}")
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
# INCLUDE FOR BUILD & INSTALL .PO FILES
diff --git a/org.tizen.data-provider-master.desktop b/data-provider-master.desktop
index 253c8b9..77d74ae 100644
--- a/org.tizen.data-provider-master.desktop
+++ b/data-provider-master.desktop
@@ -1,7 +1,7 @@
Name=Live Data Provider - Master
Type=Application
Exec=/usr/bin/data-provider-master
-Icon=org.tizen.data-provider-master.png
+Icon=data-provider-master.png
NoDisplay=True
Network=True
Comment=Homescreen-Live Box content data provider (master)
diff --git a/org.tizen.data-provider-master.manifest b/data-provider-master.manifest
index 4bdb04c..4bdb04c 100644
--- a/org.tizen.data-provider-master.manifest
+++ b/data-provider-master.manifest
diff --git a/include/conf.h b/include/conf.h
index c748a26..98a479a 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -111,8 +111,8 @@ extern int conf_loader(void);
#define DEFAULT_SCRIPT g_conf.default_conf.script
#define DEFAULT_ABI g_conf.default_conf.abi
#define DEFAULT_GROUP g_conf.default_conf.pd_group
-#define NO_CHANGE g_conf.default_conf.period
#define DEFAULT_PERIOD g_conf.default_conf.period
+#define PRIORITY_NO_CHANGE -1.0f
#define BUNDLE_SLAVE_NAME g_conf.launch_key.name
#define BUNDLE_SLAVE_SECURED g_conf.launch_key.secured
diff --git a/packaging/org.tizen.data-provider-master.spec b/packaging/data-provider-master.spec
index a297f42..e8520e5 100644
--- a/packaging/org.tizen.data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@ -1,6 +1,6 @@
-Name: org.tizen.data-provider-master
+Name: data-provider-master
Summary: Master service provider for liveboxes.
-Version: 0.16.15
+Version: 0.17.0
Release: 1
Group: framework/livebox
License: Flora License
@@ -82,8 +82,8 @@ chmod 640 /opt/dbspace/.livebox.db-journal
echo "Successfully installed. Please start a daemon again manually"
echo "%{_sysconfdir}/init.d/data-provider-master start"
-%files -n org.tizen.data-provider-master
-%manifest org.tizen.data-provider-master.manifest
+%files -n data-provider-master
+%manifest data-provider-master.manifest
%defattr(-,root,root,-)
%{_sysconfdir}/rc.d/init.d/data-provider-master
%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
diff --git a/src/script_handler.c b/src/script_handler.c
index 9c49c3f..116c220 100644
--- a/src/script_handler.c
+++ b/src/script_handler.c
@@ -653,7 +653,7 @@ static int update_info(struct inst_info *inst, struct block *block, int is_pd)
* Each livebox uses the LB_SIZE_TYPE_XXX for its size.
*/
resized = (instance_lb_width(inst) != w) || (instance_lb_height(inst) != h);
- instance_set_lb_info(inst, w, h, NO_CHANGE, CONTENT_NO_CHANGE, TITLE_NO_CHANGE);
+ instance_set_lb_info(inst, w, h, PRIORITY_NO_CHANGE, CONTENT_NO_CHANGE, TITLE_NO_CHANGE);
}
if (resized)
diff --git a/src/server.c b/src/server.c
index b0351d4..85a7f28 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4466,7 +4466,7 @@ static struct packet *slave_acquire_buffer(pid_t pid, int handle, const struct p
if (ret == 0) {
int resized;
resized = (instance_lb_width(inst) != w) || (instance_lb_height(inst) != h);
- instance_set_lb_info(inst, w, h, -1.0f, NULL, NULL);
+ instance_set_lb_info(inst, w, h, PRIORITY_NO_CHANGE, CONTENT_NO_CHANGE, TITLE_NO_CHANGE);
id = buffer_handler_id(info);
if (resized)
instance_send_resized_event(inst, IS_LB, w, h, 0);
@@ -4607,7 +4607,7 @@ static struct packet *slave_resize_buffer(pid_t pid, int handle, const struct pa
id = buffer_handler_id(info);
resized = (instance_lb_width(inst) != w) || (instance_lb_height(inst) != h);
- instance_set_lb_info(inst, w, h, -1.0f, NULL, NULL);
+ instance_set_lb_info(inst, w, h, PRIORITY_NO_CHANGE, CONTENT_NO_CHANGE, TITLE_NO_CHANGE);
if (resized)
instance_send_resized_event(inst, IS_LB, w, h, 0);
}