rename setting-test setting-plugin

- rename setting-common/setting-plugin
  setting-common/setting-common-plugin

Conflicts:

	setting-plugin/src/setting-plugin.c

Change-Id: I5658081d091714743472b2f64f27829fc2e2f394

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1857ae..c57a2c7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(SETTING_POWERSAVING setting-powersaving)
 SET(SETTING_FONT setting-font)
 SET(SETTING_STORAGE setting-storage)
 SET(SETTING_FILEVIEW setting-fileview)
-SET(SETTING_TEST setting-test)
+SET(SETTING_PLUGIN setting-plugin)
 
 SET(SETTING_PROFILE_UG ug-setting-profile-efl)
 SET(SETTING_DEVELOPEROPTION_UG ug-setting-developeroption-efl)
@@ -48,7 +48,7 @@ SET(SETTING_MENUSCREEN_UG ug-setting-menuscreen-sel-efl)
 SET(SETTING_POWERSAVING_UG ug-setting-powersaving-efl)
 SET(SETTING_FONT_UG ug-setting-font-efl)
 SET(SETTING_STORAGE_UG ug-setting-storage-efl)
-SET(SETTING_TEST_UG ug-setting-test-efl)
+SET(SETTING_PLUGIN_UG ug-setting-plugin-efl)
 
 SET(LIB_SETTING_COMMON setting-common)
 
@@ -56,8 +56,8 @@ SET(LIB_SETTING_COMMON setting-common)
 #setting main view build start
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
-
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_COMMON})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PLUGIN})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PHONE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
@@ -74,6 +74,5 @@ ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TEST})
 ADD_SUBDIRECTORY(src)
 

diff --git a/resource/setting.cfg b/resource/setting.cfg
index 4f69f2a..2056bed 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -5,7 +5,7 @@
       {
         "key_name" : "Test plugin",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Wi-Fi.png",
-        "ug_args" : "setting-test-efl",
+        "ug_args" : "setting-plugin-efl",
         "pos" : 0,
         "click_times" : 0,
         "is_resetable" : 1

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index 6240d6e..2012fea 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -37,7 +37,7 @@ ADD_LIBRARY(${LIB_SETTING_COMMON} SHARED
        ./src/setting-common-draw-naviframe.c
        ./src/setting-common-draw-genlist.c
        ./src/setting-common-general-func.c
-       ./src/setting-plugin.c
+       ./src/setting-common-plugin.c
        ./src/setting-cfg.c
 )
 

diff --git a/setting-common/include/setting-plugin.h b/setting-common/include/setting-common-plugin.h
similarity index 100%
rename from setting-common/include/setting-plugin.h
rename to setting-common/include/setting-common-plugin.h

diff --git a/setting-common/src/setting-plugin.c b/setting-common/src/setting-common-plugin.c
similarity index 99%
rename from setting-common/src/setting-plugin.c
rename to setting-common/src/setting-common-plugin.c
index cf63e55..6954263 100755 (executable)
--- a/setting-common/src/setting-plugin.c
+++ b/setting-common/src/setting-common-plugin.c
@@ -16,7 +16,7 @@
  */
 
 
-#include <setting-plugin.h>
+#include <setting-common-plugin.h>
 #include <unistd.h>
 #include <eina_list.h>
 #include <glib.h>

diff --git a/setting-test/CMakeLists.txt b/setting-plugin/CMakeLists.txt
similarity index 53%
rename from setting-test/CMakeLists.txt
rename to setting-plugin/CMakeLists.txt
index 2c8321e..ca20635 100755 (executable)
--- a/setting-test/CMakeLists.txt
+++ b/setting-plugin/CMakeLists.txt
@@ -2,9 +2,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_test REQUIRED elementary ecore ecore-x edje evas appcore-common appcore-efl ui-gadget-1 capi-appfw-application dlog capi-system-device mdm libxml-2.0)
+pkg_check_modules(pkgs_plugin REQUIRED elementary ecore ecore-x edje evas appcore-common appcore-efl ui-gadget-1 capi-appfw-application dlog capi-system-device mdm libxml-2.0)
 
-FOREACH(flag ${pkgs_test_CFLAGS})
+FOREACH(flag ${pkgs_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
@@ -22,12 +22,12 @@ ADD_DEFINITIONS("-shared")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
-ADD_LIBRARY(${SETTING_TEST_UG} SHARED
-       ./src/setting-test.c
-       ./src/setting-test-main.c
+ADD_LIBRARY(${SETTING_PLUGIN_UG} SHARED
+       ./src/setting-plugin.c
+       ./src/setting-plugin-main.c
 )
 
-TARGET_LINK_LIBRARIES(${SETTING_TEST_UG} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
-TARGET_LINK_LIBRARIES(${SETTING_TEST_UG} ${pkgs_test_LDFLAGS})
+TARGET_LINK_LIBRARIES(${SETTING_PLUGIN_UG} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
+TARGET_LINK_LIBRARIES(${SETTING_PLUGIN_UG} ${pkgs_plugin_LDFLAGS})
 
-INSTALL(TARGETS ${SETTING_TEST_UG} DESTINATION /usr/ug/lib)
+INSTALL(TARGETS ${SETTING_PLUGIN_UG} DESTINATION /usr/ug/lib)

diff --git a/setting-test/include/setting-test-main.h b/setting-plugin/include/setting-plugin-main.h
similarity index 83%
rename from setting-test/include/setting-test-main.h
rename to setting-plugin/include/setting-plugin-main.h
index 33151f6..0e5020a 100755 (executable)
--- a/setting-test/include/setting-test-main.h
+++ b/setting-plugin/include/setting-plugin-main.h
@@ -18,9 +18,9 @@
  * limitations under the License.
  *
  */
-#ifndef __SETTING_TEST_MAIN_H__
-#define __SETTING_TEST_MAIN_H__
+#ifndef __SETTING_PLUGIN_MAIN_H__
+#define __SETTING_PLUGIN_MAIN_H__
 
-#include <setting-test.h>
+#include <setting-plugin.h>
 
-#endif                         /* __SETTING_TEST_MAIN_H__ */
+#endif                         /* __SETTING_PLUGIN_MAIN_H__ */

diff --git a/setting-test/include/setting-test.h b/setting-plugin/include/setting-plugin.h
similarity index 78%
rename from setting-test/include/setting-test.h
rename to setting-plugin/include/setting-plugin.h
index 37c935a..c25b49e 100755 (executable)
--- a/setting-test/include/setting-test.h
+++ b/setting-plugin/include/setting-plugin.h
@@ -18,31 +18,29 @@
  * limitations under the License.
  *
  */
-#ifndef __SETTING_TEST_H__
-#define __SETTING_TEST_H__
+#ifndef __SETTING_PLUGIN_H__
+#define __SETTING_PLUGIN_H__
 
 #include <stdio.h>
 #include <string.h>
 
 #include <Elementary.h>
-
-
 #include <glib-object.h>
 
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
-#include <setting-plugin.h>
+#include <setting-common-plugin.h>
 
 #include <device.h>
 
-typedef struct _SettingTestUG SettingTestUG;
+typedef struct _SettingPluginUG SettingPluginUG;
 
 /**
- * Setting Test UG context
- * all UG function has void* as an agument. this is casted back to SettingTestUG
+ * Setting Plugin UG context
+ * all UG function has void* as an agument. this is casted back to SettingPluginUG
  * and the functions access app context.
  */
-struct _SettingTestUG {
+struct _SettingPluginUG {
        ui_gadget_h ug;
 
        /* add more variables here (move your appdata to here) */
@@ -66,8 +64,8 @@ struct _SettingTestUG {
        PluginNode* plugin_node;
 };
 
-extern setting_view setting_view_test_main;
+extern setting_view setting_view_plugin_main;
 
-void setting_test_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode, void *priv);
+void setting_plugin_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode, void *priv);
 
-#endif                         /* __SETTING_TEST_H__ */
+#endif                         /* __SETTING_PLUGIN_H__ */

diff --git a/setting-test/src/setting-test-main.c b/setting-plugin/src/setting-plugin-main.c
similarity index 71%
rename from setting-test/src/setting-test-main.c
rename to setting-plugin/src/setting-plugin-main.c
index aafaaae..839d0bf 100755 (executable)
--- a/setting-test/src/setting-test-main.c
+++ b/setting-plugin/src/setting-plugin-main.c
@@ -18,23 +18,23 @@
  * limitations under the License.
  *
  */
-#include <setting-test-main.h>
+#include <setting-plugin-main.h>
 #include <Ecore_X.h>
 
-static int setting_test_main_create(void *cb);
-static int setting_test_main_destroy(void *cb);
-static int setting_test_main_update(void *cb);
-static int setting_test_main_cleanup(void *cb);
+static int setting_plugin_main_create(void *cb);
+static int setting_plugin_main_destroy(void *cb);
+static int setting_plugin_main_update(void *cb);
+static int setting_plugin_main_cleanup(void *cb);
 
-setting_view setting_view_test_main = {
-       .create = setting_test_main_create,
-       .destroy = setting_test_main_destroy,
-       .update = setting_test_main_update,
-       .cleanup = setting_test_main_cleanup,
+setting_view setting_view_plugin_main = {
+       .create = setting_plugin_main_create,
+       .destroy = setting_plugin_main_destroy,
+       .update = setting_plugin_main_update,
+       .cleanup = setting_plugin_main_cleanup,
 };
 
 
-static void setting_test_main_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info);
+static void setting_plugin_main_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info);
 
 
 /* ***************************************************
@@ -42,13 +42,13 @@ static void setting_test_main_click_softkey_back_cb(void *data, Evas_Object *obj
  *basic func
  *
  ***************************************************/
-static int setting_test_main_create(void *cb)
+static int setting_plugin_main_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       SettingTestUG *ad = (SettingTestUG *) cb;
+       SettingPluginUG *ad = (SettingPluginUG *) cb;
 
        Evas_Object *scroller = NULL;
 
@@ -62,7 +62,7 @@ static int setting_test_main_create(void *cb)
                                                   ad->win_get,
                                                   "TEST", setBtnStr,
                                                   NULL,
-                                                  setting_test_main_click_softkey_back_cb,
+                                                  setting_plugin_main_click_softkey_back_cb,
                                                   NULL, ad, &scroller,
                                                   &(ad->navi_bar));
        #endif
@@ -89,16 +89,16 @@ static int setting_test_main_create(void *cb)
        ad->plugin_node = plugin_node; // the selected plugin name
 #endif
 
-       setting_view_test_main.is_create = 1;
+       setting_view_plugin_main.is_create = 1;
        return SETTING_RETURN_SUCCESS;
 }
 
-static int setting_test_main_destroy(void *cb)
+static int setting_plugin_main_destroy(void *cb)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingTestUG *ad = (SettingTestUG *) cb;
+       SettingPluginUG *ad = (SettingPluginUG *) cb;
 
 
        setting_dbus_handler_fini();
@@ -108,19 +108,19 @@ static int setting_test_main_destroy(void *cb)
 
        //if (ad->ly_main != NULL) {
        //      evas_object_del(ad->ly_main);
-               setting_view_test_main.is_create = 0;
+               setting_view_plugin_main.is_create = 0;
        //}
 
        return SETTING_RETURN_SUCCESS;
 }
 
-static int setting_test_main_update(void *cb)
+static int setting_plugin_main_update(void *cb)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       SettingTestUG *ad = (SettingTestUG *) cb;
+       SettingPluginUG *ad = (SettingPluginUG *) cb;
 
        if (ad->ly_main != NULL) {
                evas_object_show(ad->ly_main);
@@ -129,7 +129,7 @@ static int setting_test_main_update(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static int setting_test_main_cleanup(void *cb)
+static int setting_plugin_main_cleanup(void *cb)
 {
        SETTING_TRACE_BEGIN;
        return SETTING_RETURN_SUCCESS;
@@ -141,14 +141,14 @@ static int setting_test_main_cleanup(void *cb)
  *
  ***************************************************/
 
-static void setting_test_main_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info)
+static void setting_plugin_main_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        setting_retm_if(data == NULL,
-                       "[Setting > Test] Data parameter is NULL");
+                       "[Setting > Plugin] Data parameter is NULL");
 
-       SettingTestUG *ad = (SettingTestUG *) data;
+       SettingPluginUG *ad = (SettingPluginUG *) data;
 
        /* Send destroy request */
        ug_destroy_me(ad->ug);

diff --git a/setting-test/src/setting-test.c b/setting-plugin/src/setting-plugin.c
similarity index 68%
rename from setting-test/src/setting-test.c
rename to setting-plugin/src/setting-plugin.c
index 7f25b6e..701f0d2 100755 (executable)
--- a/setting-test/src/setting-test.c
+++ b/setting-plugin/src/setting-plugin.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <setting-test.h>
+#include <setting-plugin.h>
 #include <Ecore_X.h>
 
 #define SETTING_BRIGHTNESS_LEVEL_FOR_EMUL 24
@@ -28,9 +28,9 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-static void setting_test_ug_cb_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
+static void setting_plugin_ug_cb_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       SettingTestUG *ad = (SettingTestUG *) data;
+       SettingPluginUG *ad = (SettingPluginUG *) data;
        setting_view_update(ad->view_to_load, ad);
 }
 
@@ -117,46 +117,46 @@ static void _gl_del_handler(void* data, Evas_Object* obj)
 
 static void _init_itc(void* data)
 {
-       SettingTestUG *testUG = (SettingTestUG *)data;
+       SettingPluginUG *pluginUG = (SettingPluginUG *)data;
 
        //----------------------------------------------------------------
        // dialogue/separator/21/with_line
        //----------------------------------------------------------------
-       testUG->itc_seperator.item_style = "dialogue/separator";
-       testUG->itc_seperator.func.text_get = NULL;
-       testUG->itc_seperator.func.content_get = NULL;
-       testUG->itc_seperator.func.state_get = NULL;
-       testUG->itc_seperator.func.del = NULL;
+       pluginUG->itc_seperator.item_style = "dialogue/separator";
+       pluginUG->itc_seperator.func.text_get = NULL;
+       pluginUG->itc_seperator.func.content_get = NULL;
+       pluginUG->itc_seperator.func.state_get = NULL;
+       pluginUG->itc_seperator.func.del = NULL;
 
 
        //----------------------------------------------------------------
        // dialogue/1icon
        // add genlist
        //----------------------------------------------------------------
-       testUG->itc_layout.item_style = "dialogue/1icon";
-       testUG->itc_layout.func.text_get = _gl_text_handler;
-       testUG->itc_layout.func.content_get = _gl_content_handler;
-       testUG->itc_layout.func.state_get = NULL;
-       testUG->itc_layout.func.del = _gl_del_handler;
+       pluginUG->itc_layout.item_style = "dialogue/1icon";
+       pluginUG->itc_layout.func.text_get = _gl_text_handler;
+       pluginUG->itc_layout.func.content_get = _gl_content_handler;
+       pluginUG->itc_layout.func.state_get = NULL;
+       pluginUG->itc_layout.func.del = _gl_del_handler;
 }
 
-static void *setting_test_ug_on_create(ui_gadget_h ug,
+static void *setting_plugin_ug_on_create(ui_gadget_h ug,
                                          enum ug_mode mode, service_h service,
                                          void *priv)
 {
        setting_retvm_if((!priv), NULL, "!priv");
 
-       SettingTestUG *testUG = priv;
-       testUG->ug = ug;
+       SettingPluginUG *pluginUG = priv;
+       pluginUG->ug = ug;
        setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
 
-       testUG->win_main_layout = (Evas_Object *) ug_get_parent_layout(ug);
-       testUG->win_get = (Evas_Object *) ug_get_window();
-       evas_object_show(testUG->win_main_layout);
+       pluginUG->win_main_layout = (Evas_Object *) ug_get_parent_layout(ug);
+       pluginUG->win_get = (Evas_Object *) ug_get_window();
+       evas_object_show(pluginUG->win_main_layout);
 
-       testUG->evas = evas_object_evas_get(testUG->win_main_layout);
+       pluginUG->evas = evas_object_evas_get(pluginUG->win_main_layout);
 
-       setting_retvm_if(testUG->win_main_layout == NULL, NULL, "cannot get main window ");
+       setting_retvm_if(pluginUG->win_main_layout == NULL, NULL, "cannot get main window ");
 
 
        /* register view node table */
@@ -173,55 +173,55 @@ static void *setting_test_ug_on_create(ui_gadget_h ug,
        // init ITC for Gen-List
        _init_itc(testUG);
 
-       return testUG->ly_main;
+       return pluginUG->ly_main;
 }
 
-static void setting_test_ug_on_start(ui_gadget_h ug, service_h service,
+static void setting_plugin_ug_on_start(ui_gadget_h ug, service_h service,
                                        void *priv)
 {
 }
 
-static void setting_test_ug_on_pause(ui_gadget_h ug, service_h service,
+static void setting_plugin_ug_on_pause(ui_gadget_h ug, service_h service,
                                        void *priv)
 {
 }
 
-static void setting_test_ug_on_resume(ui_gadget_h ug, service_h service,
+static void setting_plugin_ug_on_resume(ui_gadget_h ug, service_h service,
                                         void *priv)
 {
 }
 
-static void setting_test_ug_on_destroy(ui_gadget_h ug, service_h service,
+static void setting_plugin_ug_on_destroy(ui_gadget_h ug, service_h service,
                                          void *priv)
 {
        SETTING_TRACE_BEGIN;
        setting_retm_if((!priv), "!priv");
-       SettingTestUG *testUG = priv;
+       SettingPluginUG *pluginUG = priv;
 
        /* fix flash issue for gallery */
-       evas_object_event_callback_del(testUG->win_main_layout, EVAS_CALLBACK_RESIZE, setting_test_ug_cb_resize);
-       testUG->ug = ug;
+       evas_object_event_callback_del(pluginUG->win_main_layout, EVAS_CALLBACK_RESIZE, setting_plugin_ug_cb_resize);
+       pluginUG->ug = ug;
 
        /*  called when this shared gadget is terminated. similar with app_exit */
-       if (&setting_view_test_main == testUG->view_to_load) {
-               setting_view_destroy(&setting_view_test_main, testUG);
+       if (&setting_view_plugin_main == pluginUG->view_to_load) {
+               setting_view_destroy(&setting_view_plugin_main, pluginUG);
        }
 
-       if (NULL != ug_get_layout(testUG->ug)) {
-               evas_object_hide((Evas_Object *) ug_get_layout(testUG->ug));
-               evas_object_del((Evas_Object *) ug_get_layout(testUG->ug));
+       if (NULL != ug_get_layout(pluginUG->ug)) {
+               evas_object_hide((Evas_Object *) ug_get_layout(pluginUG->ug));
+               evas_object_del((Evas_Object *) ug_get_layout(pluginUG->ug));
        }
 
        SETTING_TRACE_END;
 }
 
-static void setting_test_ug_on_message(ui_gadget_h ug, service_h msg,
+static void setting_plugin_ug_on_message(ui_gadget_h ug, service_h msg,
                                          service_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
 }
 
-static void setting_test_ug_on_event(ui_gadget_h ug,
+static void setting_plugin_ug_on_event(ui_gadget_h ug,
                                        enum ug_event event, service_h service,
                                        void *priv)
 {
@@ -248,12 +248,12 @@ static void setting_test_ug_on_event(ui_gadget_h ug,
        }
 }
 
-static void setting_test_ug_on_key_event(ui_gadget_h ug,
+static void setting_plugin_ug_on_key_event(ui_gadget_h ug,
                                            enum ug_key_event event,
                                            service_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
-       SettingTestUG *ad = (SettingTestUG *) priv;
+       SettingPluginUG *ad = (SettingPluginUG *) priv;
 
        switch (event) {
        case UG_KEY_EVENT_END:
@@ -274,18 +274,18 @@ static void setting_test_ug_on_key_event(ui_gadget_h ug,
 UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 {
        SETTING_TRACE_BEGIN;
-       SettingTestUG *testUG = calloc(1, sizeof(SettingTestUG));
-       setting_retvm_if(!testUG, -1, "Create SettingTestUG obj failed");
-
-       ops->create = setting_test_ug_on_create;
-       ops->start = setting_test_ug_on_start;
-       ops->pause = setting_test_ug_on_pause;
-       ops->resume = setting_test_ug_on_resume;
-       ops->destroy = setting_test_ug_on_destroy;
-       ops->message = setting_test_ug_on_message;
-       ops->event = setting_test_ug_on_event;
-       ops->key_event = setting_test_ug_on_key_event;
-       ops->priv = testUG;
+       SettingPluginUG *pluginUG = calloc(1, sizeof(SettingPluginUG));
+       setting_retvm_if(!pluginUG, -1, "Create SettingPluginUG obj failed");
+
+       ops->create = setting_plugin_ug_on_create;
+       ops->start = setting_plugin_ug_on_start;
+       ops->pause = setting_plugin_ug_on_pause;
+       ops->resume = setting_plugin_ug_on_resume;
+       ops->destroy = setting_plugin_ug_on_destroy;
+       ops->message = setting_plugin_ug_on_message;
+       ops->event = setting_plugin_ug_on_event;
+       ops->key_event = setting_plugin_ug_on_key_event;
+       ops->priv = pluginUG;
        ops->opt = UG_OPT_INDICATOR_ENABLE;
 
        return 0;
@@ -294,12 +294,12 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
 UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
 {
        SETTING_TRACE_BEGIN;
-       struct SettingTestUG *testUG;
+       struct SettingPluginUG *pluginUG;
        setting_retm_if(!ops, "ops == NULL");
 
-       testUG = ops->priv;
-       if (testUG) {
-               FREE(testUG);
+       pluginUG = ops->priv;
+       if (pluginUG) {
+               FREE(pluginUG);
        }
 }
 
@@ -309,10 +309,10 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
  *
  ***************************************************/
 
-void setting_test_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
+void setting_plugin_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
                                  void *priv)
 {
-       SettingTestUG *ad = (SettingTestUG *) priv;
+       SettingPluginUG *ad = (SettingPluginUG *) priv;
        Evas_Object *base;
 
        if (!priv)

diff --git a/src/setting-main.c b/src/setting-main.c
index a3484bd..8bb499d 100755 (executable)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -24,7 +24,7 @@
 #include <bluetooth.h>
 #include <nfc.h>
 
-#include <setting-plugin.h>
+#include <setting-common-plugin.h>
 
 #define PLUGIN_PREFIX "/opt"
 

diff --git a/src/setting.c b/src/setting.c
index e276a14..bc03422 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -21,7 +21,7 @@
 #include <Ecore_X.h>
 #include <sensor.h>
 #include <aul.h>
-#include "setting-plugin.h"
+#include "setting-common-plugin.h"
 #include "setting-main.h"
 #include <elm_object.h>
 #include <appsvc.h>