summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjk7744.park <jk7744.park@samsung.com>2015-10-24 06:48:59 (GMT)
committerjk7744.park <jk7744.park@samsung.com>2015-10-24 06:48:59 (GMT)
commit7453a5b32a6a0ab0b0f9b1943a0cbe9e7a970c8a (patch)
tree6a5d1c62f8eb0881860e02c9a73d9a6630ac48cd
parent9d77f129fcaa9fac29a06eac163b73b8b4cf6703 (diff)
downloaddata-provider-slave-tizen_2.4.zip
data-provider-slave-tizen_2.4.tar.gz
data-provider-slave-tizen_2.4.tar.bz2
-rw-r--r--icon_src/script_handler.c3
-rw-r--r--include/util.h1
-rw-r--r--org.tizen.data-provider-slave.efl10
-rw-r--r--packaging/org.tizen.data-provider-slave.spec2
-rw-r--r--src/critical_log.c3
-rw-r--r--src/fault.c3
-rw-r--r--src/main.c25
-rw-r--r--src/util.c17
-rw-r--r--svc_src/main.c11
9 files changed, 35 insertions, 40 deletions
diff --git a/icon_src/script_handler.c b/icon_src/script_handler.c
index 0812427..10b2248 100644
--- a/icon_src/script_handler.c
+++ b/icon_src/script_handler.c
@@ -15,6 +15,7 @@
#include <dlog.h>
#include <widget_errno.h>
+#include <widget_util.h>
#include "debug.h"
#include "util.h"
@@ -1427,7 +1428,7 @@ HAPI int script_handler_parse_desc(Evas_Object *edje, const char *descfile)
return WIDGET_ERROR_NONE;
errout:
- ErrPrint("Parse error at %d file %s\n", lineno, util_basename(descfile));
+ ErrPrint("Parse error at %d file %s\n", lineno, widget_util_basename(descfile));
if (block) {
delete_block(block);
}
diff --git a/include/util.h b/include/util.h
index 0efaeb1..6faf52b 100644
--- a/include/util.h
+++ b/include/util.h
@@ -16,7 +16,6 @@
extern int util_check_ext(const char *icon, const char *ext);
extern double util_timestamp(void);
-extern const char *util_basename(const char *name);
extern char *util_get_current_module(char **symbol);
extern const char *util_uri_to_path(const char *uri);
extern void *util_timer_add(double interval, Eina_Bool (*cb)(void *data), void *data);
diff --git a/org.tizen.data-provider-slave.efl b/org.tizen.data-provider-slave.efl
index d530801..4e567da 100644
--- a/org.tizen.data-provider-slave.efl
+++ b/org.tizen.data-provider-slave.efl
@@ -1,5 +1,4 @@
org.tizen.data-provider-slave system::homedir rwxat- ------
-org.tizen.data-provider-slave system::vconf rwxat- ------
org.tizen.data-provider-slave system::media rwxat- ------
org.tizen.data-provider-slave system::share rwxat- ------
org.tizen.data-provider-slave pulseaudio rwxat- ------
@@ -10,13 +9,6 @@ stest-service org.tizen.data-provider-slave r-x--- ------
org.tizen.data-provider-slave stest-service -w---- ------
org.tizen.data-provider-slave privacy-manager::db r----l ------
org.tizen.data-provider-slave pkgmgr::db r----l ------
-org.tizen.data-provider-slave system::vconf_inhouse rw---- ------
-org.tizen.data-provider-slave system::vconf_setting rw---- ------
-org.tizen.data-provider-slave system::vconf_privacy rw---- ------
-org.tizen.data-provider-slave system::vconf_system rw---- ------
-org.tizen.data-provider-slave system::vconf_multimedia rw---- ------
-org.tizen.data-provider-slave system::vconf_network rw---- ------
-org.tizen.data-provider-slave system::vconf_misc rw---- ------
org.tizen.data-provider-slave ecore::lock rwxat- ------
org.tizen.data-provider-slave system::use_internet rw---- ------
org.tizen.data-provider-slave ail::db rw---- ------
@@ -25,7 +17,6 @@ org.tizen.data-provider-slave xorg rw---- ------
org.tizen.data-provider-slave isf rwx--- ------
org.tizen.data-provider-slave dbus -wx--- ------
org.tizen.data-provider-slave data-provider-master::data r-x--- ------
-org.tizen.data-provider-slave data-provider-master::share rwxat- ------
org.tizen.data-provider-slave data-provider-master::db r----l ------
org.tizen.data-provider-slave data-provider-master::provider rw---- ------
org.tizen.data-provider-slave data-provider-master::utility rw---- ------
@@ -37,7 +28,6 @@ org.tizen.data-provider-slave sound_server rw---- ------
org.tizen.data-provider-slave tts-server rwx--- ------
org.tizen.data-provider-slave aul::launch --x--- ------
org.tizen.data-provider-slave security-server::api-cookie-check -w---- ------
-org.tizen.data-provider-slave ug-setting-call-efl::vconf r----- ------
org.tizen.data-provider-slave deviced::haptic rw---- ------
org.tizen.data-provider-slave device::input r----- ------
org.tizen.data-provider-slave privacy-manager::read r----- ------
diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index bb48b99..611ca65 100644
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -3,7 +3,7 @@
Name: org.tizen.data-provider-slave
Summary: Plugin type widget service provider
-Version: 1.0.0
+Version: 1.1.0
Release: 1
Group: Applications/Core Applications
License: Flora-1.1
diff --git a/src/critical_log.c b/src/critical_log.c
index ed54dc2..a2f3928 100644
--- a/src/critical_log.c
+++ b/src/critical_log.c
@@ -28,6 +28,7 @@
#include <Eina.h>
#include <widget_errno.h>
#include <widget_conf.h>
+#include <widget_util.h>
#include "util.h"
#include "critical_log.h"
@@ -92,7 +93,7 @@ HAPI int critical_log(const char *func, int line, const char *fmt, ...)
return WIDGET_ERROR_IO_ERROR;
}
- fprintf(s_info.fp, "%lf [%s:%d] ", util_timestamp(), util_basename((char *)func), line);
+ fprintf(s_info.fp, "%lf [%s:%d] ", util_timestamp(), widget_util_basename((char *)func), line);
va_start(ap, fmt);
ret = vfprintf(s_info.fp, fmt, ap);
diff --git a/src/fault.c b/src/fault.c
index 0f8e51f..da4792c 100644
--- a/src/fault.c
+++ b/src/fault.c
@@ -34,6 +34,7 @@
#include <widget_provider.h>
#include <widget_conf.h>
+#include <widget_util.h>
#include "critical_log.h"
#include "main.h"
@@ -139,7 +140,7 @@ static void signal_handler(int signum, siginfo_t *info, void *unused)
if (so_fname) {
int len = strlen(s_info.argv[0]);
memset(s_info.argv[0], 0, len);
- strncpy(s_info.argv[0], util_basename(so_fname), len - 1);
+ strncpy(s_info.argv[0], widget_util_basename(so_fname), len - 1);
free(so_fname);
} else {
CRITICAL_LOG("Unable to find a so_fname (%s)\n", symbol);
diff --git a/src/main.c b/src/main.c
index f1aec95..2099246 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,6 +47,7 @@
#include <widget/widget.h>
#include <widget/widget_internal.h>
#include <vconf.h>
+#include <widget_util.h>
#include "critical_log.h"
#include "debug.h"
@@ -316,7 +317,7 @@ static bool app_create(void *argv)
}
}
- critical_log_init(util_basename(((char **)argv)[0]));
+ critical_log_init(widget_util_basename(((char **)argv)[0]));
/*!
* Touch the glib type system
@@ -362,7 +363,7 @@ static bool app_create(void *argv)
DbgPrint("System time changed event callback added: %d\n", ret);
}
- ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, mmc_changed_cb, NULL);
+ ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, mmc_changed_cb, NULL);
if (ret < 0) {
DbgPrint("MMC status changed event callback added: %d\n", ret);
}
@@ -420,7 +421,7 @@ static void app_terminate(void *data)
DbgPrint("Remove time changed callback: %d\n", ret);
}
- ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, mmc_changed_cb);
+ ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, mmc_changed_cb);
if (ret < 0) {
DbgPrint("Remove MMC status changed callback: %d\n", ret);
}
@@ -484,6 +485,7 @@ static void app_control(app_control_h service, void *data)
char *secured;
char *hw_acceleration = NULL;
char *abi;
+ char *auto_align;
static int initialized = 0;
if (initialized) {
@@ -518,6 +520,12 @@ static void app_control(app_control_h service, void *data)
/* Go ahead */
}
+ ret = app_control_get_extra_data(service, WIDGET_CONF_BUNDLE_SLAVE_AUTO_ALIGN, &auto_align);
+ if (ret != APP_CONTROL_ERROR_NONE) {
+ DbgPrint("Unable to get option for auto-align\n");
+ auto_align = strdup("false");
+ }
+
if (!strcasecmp(secured, "true")) {
/* Don't use the update timer */
widget_turn_secured_on();
@@ -527,17 +535,24 @@ static void app_control(app_control_h service, void *data)
DbgPrint("Secured: %s\n", secured);
DbgPrint("hw-acceleration: %s\n", hw_acceleration);
DbgPrint("abi: %s\n", abi);
+ DbgPrint("auto_align: %s\n", auto_align);
ret = client_init(name, abi, hw_acceleration, widget_is_secured());
if (hw_acceleration && !strcasecmp(hw_acceleration, "use-gl")) {
- DbgPrint("Turn on: opengl_x11\n");
- elm_config_preferred_engine_set("opengl_x11");
+ DbgPrint("Turn on: 3d acceleration\n");
+ elm_config_accel_preference_set("3d");
}
+ if (auto_align && !strcasecmp(auto_align, "true")) {
+ DbgPrint("Turn on 'auto-align'\n");
+ elm_config_accel_preference_set("auto-align");
+ }
+
free(name);
free(secured);
free(hw_acceleration);
free(abi);
+ free(auto_align);
initialized = 1;
return;
diff --git a/src/util.c b/src/util.c
index 88694a0..ee43453 100644
--- a/src/util.c
+++ b/src/util.c
@@ -34,6 +34,7 @@
#include <widget_conf.h>
#include <widget_service.h>
#include <widget_service_internal.h>
+#include <widget_util.h>
#include "critical_log.h"
#include "util.h"
@@ -89,20 +90,6 @@ HAPI double util_timestamp(void)
#endif
}
-HAPI const char *util_basename(const char *name)
-{
- int length;
-
- length = name ? strlen(name) : 0;
- if (!length) {
- return ".";
- }
-
- while (--length > 0 && name[length] != '/');
-
- return length <= 0 ? name : name + length + (name[length] == '/');
-}
-
/*!
* \note
* Just trying to find the nearest module.
@@ -228,7 +215,7 @@ static int dump_so_info_cb(struct dl_phdr_info *info, size_t size, void *data)
{
if (data && info->dlpi_name && !strcmp(data, info->dlpi_name)) {
register int i;
- ErrPrint("Base Address of %s [%p]\n", util_basename(info->dlpi_name), info->dlpi_addr);
+ ErrPrint("Base Address of %s [%p]\n", widget_util_basename(info->dlpi_name), info->dlpi_addr);
for (i = 0; i < info->dlpi_phnum; i++) {
ErrPrint("type[%x] off[%x] vaddr[%lx] paddr[%lx] fsz[%x] msz[%x] f[%x] align[%x]\n",
info->dlpi_phdr[i].p_type,
diff --git a/svc_src/main.c b/svc_src/main.c
index 87d5fb5..a05825d 100644
--- a/svc_src/main.c
+++ b/svc_src/main.c
@@ -47,6 +47,7 @@
#include <widget/widget.h>
#include <widget/widget_internal.h>
#include <vconf.h>
+#include <widget_util.h>
#include "critical_log.h"
#include "debug.h"
@@ -316,7 +317,7 @@ static bool app_create(void *argv)
}
}
- critical_log_init(util_basename(((char **)argv)[0]));
+ critical_log_init(widget_util_basename(((char **)argv)[0]));
/*!
* Touch the glib type system
@@ -362,7 +363,7 @@ static bool app_create(void *argv)
DbgPrint("System time changed event callback added: %d\n", ret);
}
- ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, mmc_changed_cb, NULL);
+ ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, mmc_changed_cb, NULL);
if (ret < 0) {
DbgPrint("MMC status changed event callback added: %d\n", ret);
}
@@ -419,7 +420,7 @@ static void app_terminate(void *data)
DbgPrint("Remove time changed callback: %d\n", ret);
}
- ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS, mmc_changed_cb);
+ ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, mmc_changed_cb);
if (ret < 0) {
DbgPrint("Remove MMC status changed callback: %d\n", ret);
}
@@ -517,8 +518,8 @@ static void app_control(app_control_h service, void *data)
ret = client_init(name, abi, hw_acceleration, widget_is_secured());
if (hw_acceleration && !strcasecmp(hw_acceleration, "use-gl")) {
- DbgPrint("Turn on: opengl_x11\n");
- elm_config_preferred_engine_set("opengl_x11");
+ DbgPrint("Turn on: 3d acceleration\n");
+ elm_config_accel_preference_set("3d");
}
free(name);