From ec699b30aa8cfd761d1042a5d3b1275ce691931a Mon Sep 17 00:00:00 2001
From: Sung-jae Park <nicesj.park@samsung.com>
Date: Mon, 11 May 2015 21:35:52 +0900
Subject: [PATCH] Fix build error

Change-Id: Iadc0d04d6b7634efa21d24665c29c8a6b9adf49c
---
 icon_src/main.c                              | 2 +-
 packaging/org.tizen.data-provider-slave.spec | 2 +-
 src/client.c                                 | 3 +--
 src/fault.c                                  | 1 +
 src/main.c                                   | 7 ++++---
 src/so_handler.c                             | 2 +-
 src/util_wayland.c                           | 5 ++++-
 src/widget.c                                 | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/icon_src/main.c b/icon_src/main.c
index c30a740..4a7cf72 100644
--- a/icon_src/main.c
+++ b/icon_src/main.c
@@ -439,7 +439,7 @@ static void font_changed_cb(keynode_t *node, void *user_data)
 {
 	char *font_name;
 
-	evas_font_reinit();
+//	evas_font_reinit();
 
 	if (s_info.font_name) {
 		font_name = vconf_get_str("db/setting/accessibility/font_name");
diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 2479779..efa2bc4 100644
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -5,7 +5,7 @@ Name: org.tizen.data-provider-slave
 Summary: Plugin type widget service provider
 Version: 1.0.0
 Release: 1
-Group: HomeTF/Livebox
+Group: Applications/Core Applications
 License: Flora License, Version 1.1
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
diff --git a/src/client.c b/src/client.c
index 3235ce8..b1a6f84 100644
--- a/src/client.c
+++ b/src/client.c
@@ -22,15 +22,14 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <Ecore.h>
-#include <Ecore_X.h>
 
 #include <app.h>
 #include <dlog.h>
 #include <aul.h>
 #include <sqlite3.h>
 
-#include <widget_provider.h> /* widget_provider */
 #include <widget_errno.h> /* widget_service */
+#include <widget_provider.h> /* widget_provider */
 #include <widget_script.h> /* widget_service - widget_event_info */
 #include <widget_conf.h>
 #include <widget/widget_internal.h> /* widget - WIDGET_SYS_EVENT_XXX */
diff --git a/src/fault.c b/src/fault.c
index dcfbe1e..30ff933 100644
--- a/src/fault.c
+++ b/src/fault.c
@@ -32,6 +32,7 @@
 #include <Eina.h>
 #include <Ecore.h>
 
+#include <widget_errno.h>
 #include <widget_provider.h>
 #include <widget_conf.h>
 
diff --git a/src/main.c b/src/main.c
index f1aec95..cbac738 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <json-glib/json-glib.h>
 #include <Ecore.h>
-#include <Ecore_X.h>
 #include <app.h>
 #include <Edje.h>
 #include <Eina.h>
@@ -40,11 +39,13 @@
 
 #include <dlog.h>
 #include <bundle.h>
+#include <widget_errno.h>
 #include <widget_service.h>
+#include <widget_service_internal.h>
 #include <widget_provider.h>
 #include <widget_script.h>
 #include <widget_conf.h>
-#include <widget/widget.h>
+#include <widget/widget.h>	/* Conflict with local widget.h */
 #include <widget/widget_internal.h>
 #include <vconf.h>
 
@@ -531,7 +532,7 @@ static void app_control(app_control_h service, void *data)
 
 	if (hw_acceleration && !strcasecmp(hw_acceleration, "use-gl")) {
 		DbgPrint("Turn on: opengl_x11\n");
-		elm_config_preferred_engine_set("opengl_x11");
+		elm_config_accel_preference_set("opengl");
 	}
 
 	free(name);
diff --git a/src/so_handler.c b/src/so_handler.c
index c7a91e8..55709cb 100644
--- a/src/so_handler.c
+++ b/src/so_handler.c
@@ -22,10 +22,10 @@
 
 #include <dlog.h>
 #include <Eina.h>
+#include <widget_errno.h>
 #include <widget_provider.h>
 #include <widget_service.h>
 #include <widget_service_internal.h>
-#include <widget_errno.h>
 #include <widget_script.h>
 #include <widget_conf.h>
 
diff --git a/src/util_wayland.c b/src/util_wayland.c
index 7ed8c75..6b330ab 100644
--- a/src/util_wayland.c
+++ b/src/util_wayland.c
@@ -1,7 +1,10 @@
-#include "util.h"
+#include <stdio.h>
+#include <Eina.h>
 
 #include <widget_errno.h>
 
+#include "util.h"
+
 void *util_screen_get(void)
 {
 	return NULL;
diff --git a/src/widget.c b/src/widget.c
index 671f8ec..52ac389 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -23,11 +23,11 @@
 #include <Eina.h>
 
 #include <dlog.h>
+#include <widget_errno.h>
 #include <widget_provider.h>
 #include <widget_provider_buffer.h>
 #include <widget/widget_internal.h>
 #include <widget/widget.h>
-#include <widget_errno.h>
 #include <widget_service.h>
 #include <widget_util.h>
 #include <widget_service_internal.h>
-- 
2.7.4