Merge branch 'master' into tizen_2.1

[apps/core/preloaded/settings.git] / include / setting.h

diff --git a/include/setting.h b/include/setting.h
index ad6118c..de33df0 100755 (executable)
--- a/include/setting.h
+++ b/include/setting.h
@@ -1,22 +1,18 @@
 /*
  * setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * 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");
+ * Licensed under the Flora License, Version 1.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://www.apache.org/licenses/LICENSE-2.0
+ *     http://floralicense.org/license/
  *
  * 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.
- *
  */
 /**
  *@defgroup setting-app
@@ -107,15 +103,19 @@ typedef struct _setting_main_appdata {
 
        ui_gadget_h ug;
        TapiHandle *handle;
-               
+       Evas_Object *popup;
+       Evas_Object *app_icon;
+
        Eina_Bool bAppPause;
        Eina_Bool updateItems[GL_ITEM_MAX];
 
+       Ecore_Idler *refresh_idler;
+
        Evas *evas;
        Evas_Object *win_main;
        Evas_Object *controlbar;
 
-       Evas_Object *controllbar_all_check;
+       //Evas_Object *controllbar_all_check;
        Evas_Object *gl_sel_all;
 
        menu_list_load_fn load_fns[Func_Type_MAX];
@@ -150,6 +150,9 @@ typedef struct _setting_main_appdata {
        Setting_GenGroupItem_Data *data_moreConnect;
        Setting_GenGroupItem_Data *data_nfc;
 
+       //following are not for update..
+       Setting_GenGroupItem_Data *data_network;
+
        Setting_View_Type view_type;
 
        Evas_Object *main_genlist;                              /**< 'Setting main' in main page */
@@ -169,11 +172,13 @@ typedef struct _setting_main_appdata {
 
        const char *more_connective_menus[MAX_MORE_MENU_NUM];
        const char *more_system_menus[MAX_MORE_MENU_NUM];
-       
-       // plugin xml path;
-       char* plugin_path;      
-//     PluginNode* plugin_node;
+
+       char* plugin_path;
        void* plugin_node;
+       char* view_to_jump;
+       char cur_loaded_ug[MAX_DISPLAY_NAME_LEN_ON_UI];
+
+       Evas_Object *conform;
 
 } setting_main_appdata;
 
@@ -182,5 +187,6 @@ extern setting_view setting_view_main;
 extern setting_view setting_view_more_menu;
 extern void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object *genlist);
 extern void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object *genlist);
+extern void __gl_realized(void *data, Evas_Object *obj, void *event_info);
 
 #endif                         /* __SETTING_H__ */