merge with master

diff --git a/debian/changelog b/debian/changelog
index 57b2a41..9b2759c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+wrt-setting (0.0.32) unstable; urgency=low
+
+  * Adding the smack rule include files
+
+ -- Jihoon Chung <jihoon.chung@samsung.com>  Wed, 13 Mar 2013 17:15:04 +0900
+
+wrt-setting (0.0.31) unstable; urgency=low
+
+  * Remove web storage & filesystem usage code
+
+ -- Jihoon Chung <jihoon.chung@samsung.com>  Wed, 06 Mar 2013 19:04:45 +0900
+
+wrt-setting (0.0.30) unstable; urgency=low
+
+  * Implement tizen privilege for w3c API
+  * Fixed the wrong creation of security origin db
+  * Changing the wrt-setting pkg version
+
+ -- leerang <leerang.song@samsung.com>  Fri, 22 Feb 2013 15:40:11 +0900
+
+wrt-setting (0.0.29) unstable; urgency=low
+
+  * Chaning the ID to TizenAppID from PkgID
+  * Change the number of Display language
+  * Prevent issues fixes
+  * License name change tizenopensource to floralicense
+
+  * Git : apps/home/wrt-setting
+  * Tag : wrt-setting_0.0.29
+
+ -- leerang <leerang.song@samsung.com>  Wed, 20 Feb 2013 14:19:16 +0900
+
 wrt-setting (0.0.28) unstable; urgency=low
 
   * Fix of license display in wrong language

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 32d924e..d1eeea5 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.28
+Version: 0.0.32
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries
@@ -41,6 +41,8 @@ rm -rf %{buildroot}
 
 %files
 %manifest wrt-setting.manifest
+/etc/smack/accesses2.d/ug.webapp-common-efl.include
+/etc/smack/accesses2.d/ug.webapp-detail-efl.include
 %defattr(-,root,root,-)
 %{_datadir}/license/%{name}
 /opt/ug/*

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index dc0af60..e906fd7 100755 (executable)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,10 +1,10 @@
 # for i18n
-SET(POFILES hy.po az.po eu.po bg.po ca.po zh_CN.po zh_HK.po
+SET(POFILES hy.po az.po eu.po bg.po ca.po
 cs.po da.po nl_NL.po en.po en_US.po et.po fi.po fr_FR.po gl.po hr.po
-ka.po de_DE.po el_GR.po hu.po is.po ga.po it_IT.po ja_JP.po kk.po
-ko_KR.po lv.po lt.po mk.po nb.po pl.po pt_PT.po pt_BR.po ro.po
+ka.po de_DE.po el_GR.po hu.po is.po it_IT.po kk.po
+ko_KR.po lv.po lt.po nb.po pl.po pt_PT.po pt_BR.po ro.po
 ru_RU.po sr.po sk.po sl.po es_ES.po es_MX.po sv.po tr_TR.po uk.po
-uz.po ar.po zh_SG.po hi.po en_PH.po fr_CA.po zh_TW.po)
+uz.po fr_CA.po)
 
 SET(PROJECT_NAME "ug-webapp-common-efl")
 SET(LOCALE_DIR "/usr/ug/res/locale/")

diff --git a/webapp-common/CMakeLists.txt b/webapp-common/CMakeLists.txt
index 3201a43..7561002 100755 (executable)
--- a/webapp-common/CMakeLists.txt
+++ b/webapp-common/CMakeLists.txt
@@ -48,6 +48,7 @@ SET_TARGET_PROPERTIES(${TARGET_UG_LIB} PROPERTIES SOVERSION ${PROJECT_API_VERSIO
 SET_TARGET_PROPERTIES(${TARGET_UG_LIB} PROPERTIES VERSION ${PROJECT_VERSION})
 TARGET_LINK_LIBRARIES(${TARGET_UG_LIB} ${UG_WEB_APP_COMMON_DEPS_LDFLAGS})
 INSTALL(TARGETS ${TARGET_UG_LIB} DESTINATION ${UGDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ug.webapp-common-efl.include DESTINATION /etc/smack/accesses2.d)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons/ DESTINATION ${ICONDIR} FILES_MATCHING PATTERN "*.png")
 
 ADD_SUBDIRECTORY(edc)

diff --git a/webapp-common/ug.webapp-common-efl.include b/webapp-common/ug.webapp-common-efl.include
new file mode 100644 (file)
index 0000000..fd3a922
--- /dev/null
+++ b/webapp-common/ug.webapp-common-efl.include
@@ -0,0 +1 @@
+$1 wrt-commons::db_wrt rwx

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index 0f07eb2..b3cfd1c 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -59,5 +59,6 @@ SET_TARGET_PROPERTIES(${TARGET_UG_DETAIL_LIB} PROPERTIES SOVERSION ${PROJECT_API
 SET_TARGET_PROPERTIES(${TARGET_UG_DETAIL_LIB} PROPERTIES VERSION   ${PROJECT_VERSION})
 TARGET_LINK_LIBRARIES(${TARGET_UG_DETAIL_LIB} ${UG_WEB_APP_DETAIL_DEPS_LDFLAGS} ${UG_WEB_APP_DETAIL_DEPS_LIBRARIES})
 INSTALL(TARGETS ${TARGET_UG_DETAIL_LIB} DESTINATION ${UGDIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ug.webapp-detail-efl.include DESTINATION /etc/smack/accesses2.d)
 
 ADD_SUBDIRECTORY(edc)

diff --git a/webapp-detail/advancedview.cpp b/webapp-detail/advancedview.cpp
index 7981f72..c4b1cdf 100644 (file)
--- a/webapp-detail/advancedview.cpp
+++ b/webapp-detail/advancedview.cpp
@@ -43,7 +43,7 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT_1ICON_6 = "1text.1icon.6";
 const char* const TEXT_NAVIFRAME_TITLE = "Advanced Settings";
 }
 
-AdvancedView::AdvancedView(Evas_Object *navi, int appID) :
+AdvancedView::AdvancedView(Evas_Object *navi, DPL::String appID) :
     m_naviframe(navi),
     m_appID(appID)
 {
@@ -56,10 +56,6 @@ AdvancedView::AdvancedView(Evas_Object *navi, int appID) :
         "Location";
     m_menuMap[SECURITY_SETTINGS_IDX_WEB_NOTIFICATION_USAGE] =
         "Web notification";
-    m_menuMap[SECURITY_SETTINGS_IDX_WEB_DATABASE_USAGE] =
-        "Web database";
-    m_menuMap[SECURITY_SETTINGS_IDX_FILE_SYSTEM_USAGE] =
-        "File system access";
     m_menuMap[SECURITY_SETTINGS_IDX_EXCEPTIONS_SETTINGS] =
         "Exceptions Settings";
     m_menuMap[DEVELOPER_OPTIONS_IDX_MEMORY_SAVING_MODE] =
@@ -217,14 +213,18 @@ bool AdvancedView::loadView(void)
         elm_genlist_item_select_mode_set(groupItem,
                                          ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-        if (index == GROUP_IDX_SECURITY_SETTINGS) {
+        switch(index) {
+        case GROUP_IDX_SECURITY_SETTINGS:
             // create Security Settings menu
             loadSecuritySettingsMenu(genlist);
-        } else if (index == GROUP_IDX_DEVELOPER_OPTIONS) {
+            break;
+        case GROUP_IDX_DEVELOPER_OPTIONS:
             // create developer Options menu
             loadDeveloperOptionsMenu(genlist);
-        } else {
+            break;
+        default:
             LogError("Wrong index");
+            break;
         }
     }
     elm_naviframe_item_push(m_naviframe,
@@ -303,7 +303,7 @@ void AdvancedView::loadDeveloperOptionsMenu(Evas_Object* genlist)
     }
 }
 
-SettingData::SettingData(int appID, int index, std::string menuText) :
+SettingData::SettingData(DPL::String appID, int index, std::string menuText) :
     m_index(static_cast<MenuIndex>(index)),
     m_menuText(menuText)
 {
@@ -321,10 +321,6 @@ bool SettingData::isEnabled()
     } else if (m_index == SECURITY_SETTINGS_IDX_WEB_NOTIFICATION_USAGE) {
         key = VconfConfig::GetVconfKeyWebNotificationUsage(
             m_dao->getPkgName());
-    } else if (m_index == SECURITY_SETTINGS_IDX_WEB_DATABASE_USAGE) {
-        key = VconfConfig::GetVconfKeyWebDatabaseUsage(m_dao->getPkgName());
-    } else if (m_index == SECURITY_SETTINGS_IDX_FILE_SYSTEM_USAGE) {
-        key = VconfConfig::GetVconfKeyFilesystemUsage(m_dao->getPkgName());
     } else if (m_index == DEVELOPER_OPTIONS_IDX_MEMORY_SAVING_MODE) {
         key = VconfConfig::GetVconfKeyMemorySavingMode(m_dao->getPkgName());
     } else {
@@ -357,10 +353,6 @@ void SettingData::saveChange(bool state)
     } else if (m_index == SECURITY_SETTINGS_IDX_WEB_NOTIFICATION_USAGE) {
         key = VconfConfig::GetVconfKeyWebNotificationUsage(
             m_dao->getPkgName());
-    } else if (m_index == SECURITY_SETTINGS_IDX_WEB_DATABASE_USAGE) {
-        key = VconfConfig::GetVconfKeyWebDatabaseUsage(m_dao->getPkgName());
-    } else if (m_index == SECURITY_SETTINGS_IDX_FILE_SYSTEM_USAGE) {
-        key = VconfConfig::GetVconfKeyFilesystemUsage(m_dao->getPkgName());
     } else if (m_index == DEVELOPER_OPTIONS_IDX_MEMORY_SAVING_MODE) {
         key = VconfConfig::GetVconfKeyMemorySavingMode(m_dao->getPkgName());
     } else {

diff --git a/webapp-detail/advancedview.h b/webapp-detail/advancedview.h
index 4099084..9572e05 100644 (file)
--- a/webapp-detail/advancedview.h
+++ b/webapp-detail/advancedview.h
@@ -23,6 +23,7 @@
 #include <string>
 #include <map>
 #include <dpl/scoped_ptr.h>
+#include <dpl/string.h>
 
 #include "view.h"
 
@@ -46,8 +47,6 @@ enum MenuIndex {
     SECURITY_SETTINGS_IDX_SECURITY_POPUP_USAGE = SECURITY_SETTINGS_IDX_START,
     SECURITY_SETTINGS_IDX_GEOLOCATION_USAGE,
     SECURITY_SETTINGS_IDX_WEB_NOTIFICATION_USAGE,
-    SECURITY_SETTINGS_IDX_WEB_DATABASE_USAGE,
-    SECURITY_SETTINGS_IDX_FILE_SYSTEM_USAGE,
     SECURITY_SETTINGS_IDX_EXCEPTIONS_SETTINGS,
     SECURITY_SETTINGS_IDX_END = SECURITY_SETTINGS_IDX_EXCEPTIONS_SETTINGS,
     DEVELOPER_OPTIONS_IDX_START = SECURITY_SETTINGS_IDX_END,
@@ -58,7 +57,7 @@ enum MenuIndex {
 class AdvancedView : public View
 {
   public:
-    AdvancedView(Evas_Object *naviframe, int appID);
+    AdvancedView(Evas_Object *naviframe, DPL::String appID);
     ~AdvancedView(void);
 
     bool loadView(void);
@@ -67,7 +66,7 @@ class AdvancedView : public View
 
   private:
     Evas_Object *m_naviframe;
-    int m_appID;
+    DPL::String m_appID;
     DPL::ScopedPtr<ExceptionsView> m_exceptionsView;
     std::map<int, std::string> m_groupMenuMap;
     std::map<int, std::string> m_menuMap;
@@ -127,7 +126,7 @@ class SettingData
     std::string m_menuText;
     std::string m_iconPart;
 
-    SettingData(int appID, int index, std::string menuText);
+    SettingData(DPL::String appID, int index, std::string menuText);
     bool isEnabled();
     void saveChange(bool state);
 };

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 266101c..1727733
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -1017,7 +1017,7 @@ bool DetailView::pushToNaviFrame(void)
     return true;
 }
 
-DetailView::DetailView(Evas_Object* navi, ui_gadget_h ug, int appID) :
+DetailView::DetailView(Evas_Object* navi, ui_gadget_h ug, DPL::String appID) :
     m_naviframe(navi),
     m_bx(NULL),
     m_appID(appID),

diff --git a/webapp-detail/detailview.h b/webapp-detail/detailview.h
index 0268fc4..368cdca 100755 (executable)
--- a/webapp-detail/detailview.h
+++ b/webapp-detail/detailview.h
@@ -53,7 +53,7 @@ class DetailView : public View
     ui_gadget_h m_ug;
     DPL::ScopedPtr<WrtDB::WidgetDAO> m_dao;
     WrtDB::WidgetLocalizedInfo m_localizedInfo;
-    int m_appID;
+    DPL::String m_appID;
     LicenseInfo *m_licenseInfo;
     DPL::ScopedPtr<AdvancedView> m_advancedView;
 
@@ -131,7 +131,7 @@ class DetailView : public View
                                     void *event_info);
     bool pushToNaviFrame(void);
   public:
-    DetailView(Evas_Object* naviframe, ui_gadget_h ug, int appID);
+    DetailView(Evas_Object* naviframe, ui_gadget_h ug, DPL::String appID);
     ~DetailView(void);
 
     Evas_Object *loadView(void);

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 867bc05..d8dd3f5
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -24,6 +24,7 @@
 #include <dpl/foreach.h>
 #include <dpl/assert.h>
 #include <dpl/string.h>
+#include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <wrt-commons/security-origin-dao/security_origin_dao.h>
 
 //#include <ui-gadget.h>
@@ -59,12 +60,14 @@ const char* const TEXT_NAVIFRAME_TITLE = "Exceptions Settings";
 
 }
 
-ExceptionsView::ExceptionsView(Evas_Object* navi, int appID) :
+ExceptionsView::ExceptionsView(Evas_Object* navi, DPL::String appID) :
     m_naviframe(navi)
 {
+    WrtDB::WidgetDAOReadOnly dao(appID);
+    WrtDB::TizenPkgId pkgName = dao.getTizenPkgId();
     m_securityOriginDao =
         SecurityOriginDB::SecurityOriginDAOPtr(
-            new SecurityOriginDB::SecurityOriginDAO(appID));
+            new SecurityOriginDB::SecurityOriginDAO(pkgName));
 }
 
 ExceptionsView::~ExceptionsView(void)
@@ -146,13 +149,17 @@ void ExceptionsView::loadExceptionsSettingsView(
         ExceptionsSettingsData* data =
             new ExceptionsSettingsData(m_securityOriginDao.get(),
                                        *(*it));
-        elm_genlist_item_append(genlist,
-                                &itcExceptionsSettings,
-                                static_cast<void*>(data),
-                                NULL,
-                                ELM_GENLIST_ITEM_NONE,
-                                selectedCallback,
-                                NULL);
+        Elm_Object_Item *objectItem;
+        objectItem = elm_genlist_item_append(genlist,
+                                             &itcExceptionsSettings,
+                                             static_cast<void*>(data),
+                                             NULL,
+                                             ELM_GENLIST_ITEM_NONE,
+                                             selectedCallback,
+                                             NULL);
+        if (m_securityOriginDao->isReadOnly(*(*it))) {
+            elm_object_item_disabled_set(objectItem, EINA_TRUE);
+        }
     }
 }
 

diff --git a/webapp-detail/exceptionsview.h b/webapp-detail/exceptionsview.h
old mode 100644 (file)
new mode 100755 (executable)
index 042bd19..6490364
--- a/webapp-detail/exceptionsview.h
+++ b/webapp-detail/exceptionsview.h
@@ -36,7 +36,7 @@ namespace WebAppDetailSetting {
 class ExceptionsView : public View
 {
   public:
-    ExceptionsView(Evas_Object *naviframe, int appID);
+    ExceptionsView(Evas_Object *naviframe, DPL::String appID);
     ~ExceptionsView(void);
 
     bool loadView(void);
@@ -47,7 +47,7 @@ class ExceptionsView : public View
 
   private:
     Evas_Object *m_naviframe;
-    int m_appID;
+    DPL::String m_appID;
     SecurityOriginDB::SecurityOriginDAOPtr m_securityOriginDao;
 
     //Genlist

diff --git a/webapp-detail/mainview.cpp b/webapp-detail/mainview.cpp
index 640debc..6eee607 100755 (executable)
--- a/webapp-detail/mainview.cpp
+++ b/webapp-detail/mainview.cpp
@@ -157,7 +157,7 @@ del_ly:
     return NULL;
 }
 
-MainView::MainView(ui_gadget_h ug, int appId) :
+MainView::MainView(ui_gadget_h ug, DPL::String appId) :
     m_ug(ug),
     m_appID(appId),
     m_subCtnt(NULL),

diff --git a/webapp-detail/mainview.h b/webapp-detail/mainview.h
old mode 100644 (file)
new mode 100755 (executable)
index 1063c10..d601f78
--- a/webapp-detail/mainview.h
+++ b/webapp-detail/mainview.h
@@ -30,7 +30,7 @@ namespace WebAppDetailSetting {
 class MainView : public View
 {
     ui_gadget_h m_ug;
-    int m_appID;
+    DPL::String m_appID;
     Evas_Object *m_subCtnt;
     DPL::ScopedPtr<DetailView> m_detail;
     DPL::ScopedPtr<PermView> m_perm;
@@ -48,7 +48,7 @@ class MainView : public View
     Evas_Object *createToolBar(Evas_Object *parent);
 
   public:
-    MainView(ui_gadget_h ug, int appId);
+    MainView(ui_gadget_h ug, DPL::String appId);
     ~MainView(void);
 
     Evas_Object *loadView(void);

diff --git a/webapp-detail/ug.cpp b/webapp-detail/ug.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3ad9cea..44d12dd
--- a/webapp-detail/ug.cpp
+++ b/webapp-detail/ug.cpp
@@ -23,6 +23,7 @@
 
 #undef None
 #include <dpl/wrt-dao-ro/WrtDatabase.h>
+#include <dpl/wrt-dao-ro/common_dao_types.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 
 #include "mainview.h"
@@ -39,7 +40,7 @@ static void *onCreate(ui_gadget_h ug,
                       void *user_data)
 {
     struct priv *priv;
-    int appID;
+    WrtDB::TizenAppId appID;
     char *pkgname = NULL;
 
     Assert(ug && user_data);
@@ -49,9 +50,8 @@ static void *onCreate(ui_gadget_h ug,
     if (!pkgname)
         return NULL;
 
-    appID = static_cast<int>
-        (WrtDB::WidgetDAOReadOnly::getHandle(DPL::FromASCIIString
-                                             (std::string(pkgname))));
+    appID = WrtDB::WidgetDAOReadOnly::getTzAppId((DPL::FromASCIIString
+                                                 (std::string(pkgname))));
 
     /* Create MainView */
     try {

diff --git a/webapp-detail/ug.webapp-detail-efl.include b/webapp-detail/ug.webapp-detail-efl.include
new file mode 100644 (file)
index 0000000..fd3a922
--- /dev/null
+++ b/webapp-detail/ug.webapp-detail-efl.include
@@ -0,0 +1 @@
+$1 wrt-commons::db_wrt rwx