tizen 2.3 release

[apps/home/settings.git] / setting-menuscreen / src / setting-menuscreen.c

diff --git a/setting-menuscreen/src/setting-menuscreen.c b/setting-menuscreen/src/setting-menuscreen.c
index b2f6cf1..f189ff9 100755 (executable)
--- a/setting-menuscreen/src/setting-menuscreen.c
+++ b/setting-menuscreen/src/setting-menuscreen.c
@@ -1,18 +1,22 @@
 /*
  * setting
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * Licensed under the Flora License, Version 1.1 (the License);
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
+ *
+ * Contact: MyoungJune Park <mj2004.park@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://floralicense.org/license/
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 #include <setting-menuscreen.h>
 #include <Ecore_X.h>
@@ -21,14 +25,14 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-setting_view *__get_menuscreen_view_to_load(service_h service)
+setting_view *__get_menuscreen_view_to_load(app_control_h service)
 {
        SETTING_TRACE_BEGIN;
        //setting_retvm_if(NULL == data, NULL, "NULL == data");
        return &setting_view_menuscreen_main;
 }
 
-Evas_Object *__get_menuscreen_layout_to_return(service_h service, void *priv)
+Evas_Object *__get_menuscreen_layout_to_return(app_control_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
        SettingMenuscreenUG *menuscreenUG = priv;
@@ -44,7 +48,7 @@ static void setting_menuscreen_ug_cb_resize(void *data, Evas *e,
 }
 
 static void *setting_menuscreen_ug_on_create(ui_gadget_h ug,
-                                         enum ug_mode mode, service_h service,
+                                         enum ug_mode mode, app_control_h service,
                                          void *priv)
 {
        setting_retvm_if((!priv), NULL, "!priv");
@@ -70,13 +74,6 @@ static void *setting_menuscreen_ug_on_create(ui_gadget_h ug,
        //setting_create_Gendial_itc("dialogue/1text.1icon.2", &(menuscreenUG->itc_1text_1icon));
        setting_create_Gendial_itc("dialogue/1text.1icon.2", &(menuscreenUG->itc_1text_1icon_2));
 
-       menuscreenUG->itc_seperator.item_style = "dialogue/separator";
-       menuscreenUG->itc_seperator.func.text_get = NULL;
-       menuscreenUG->itc_seperator.func.content_get = NULL;
-       menuscreenUG->itc_seperator.func.state_get = NULL;
-       menuscreenUG->itc_seperator.func.del = NULL;
-
-
        setting_create_Gendial_itc("dialogue/1text", &(menuscreenUG->itc_1text));
 
        /*  creating a view. */
@@ -88,17 +85,17 @@ static void *setting_menuscreen_ug_on_create(ui_gadget_h ug,
        return __get_menuscreen_layout_to_return(service, menuscreenUG);
 }
 
-static void setting_menuscreen_ug_on_start(ui_gadget_h ug, service_h service,
+static void setting_menuscreen_ug_on_start(ui_gadget_h ug, app_control_h service,
                                        void *priv)
 {
 }
 
-static void setting_menuscreen_ug_on_pause(ui_gadget_h ug, service_h service,
+static void setting_menuscreen_ug_on_pause(ui_gadget_h ug, app_control_h service,
                                        void *priv)
 {
 }
 
-static void setting_menuscreen_ug_on_resume(ui_gadget_h ug, service_h service,
+static void setting_menuscreen_ug_on_resume(ui_gadget_h ug, app_control_h service,
                                         void *priv)
 {
 }
@@ -116,7 +113,7 @@ static void _clear_menuscreen_list(Eina_List *menu_screen_list)
     eina_list_free( menu_screen_list );
 }
 
-static void setting_menuscreen_ug_on_destroy(ui_gadget_h ug, service_h service,
+static void setting_menuscreen_ug_on_destroy(ui_gadget_h ug, app_control_h service,
                                          void *priv)
 {
        SETTING_TRACE_BEGIN;
@@ -147,14 +144,14 @@ static void setting_menuscreen_ug_on_destroy(ui_gadget_h ug, service_h service,
        SETTING_TRACE_END;
 }
 
-static void setting_menuscreen_ug_on_message(ui_gadget_h ug, service_h msg,
-                                         service_h service, void *priv)
+static void setting_menuscreen_ug_on_message(ui_gadget_h ug, app_control_h msg,
+                                         app_control_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
 }
 
 static void setting_menuscreen_ug_on_event(ui_gadget_h ug,
-                                       enum ug_event event, service_h service,
+                                       enum ug_event event, app_control_h service,
                                        void *priv)
 {
        SETTING_TRACE_BEGIN;
@@ -182,7 +179,7 @@ static void setting_menuscreen_ug_on_event(ui_gadget_h ug,
 
 static void setting_menuscreen_ug_on_key_event(ui_gadget_h ug,
                                            enum ug_key_event event,
-                                           service_h service, void *priv)
+                                           app_control_h service, void *priv)
 {
        SETTING_TRACE_BEGIN;
        SettingMenuscreenUG *ad = (SettingMenuscreenUG *) priv;
@@ -245,7 +242,7 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
 void setting_menuscreen_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
                                  void *priv)
 {
-       SettingMenuscreenUG *ad = (SettingMenuscreenUG *) priv;
+       //SettingMenuscreenUG *ad = (SettingMenuscreenUG *) priv;
        Evas_Object *base;
 
        if (!priv)
@@ -272,10 +269,3 @@ void setting_menuscreen_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
 
 
 /*****/
-UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
-{
-       SETTING_TRACE_BEGIN;
-       return 0;
-}
-
-/*****/