[Release] wrt-setting_0.0.33

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b51db40
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+*.log
+*.a
+*.o
+*.so
+*.so.*
+*.sql
+*.db
+*.db-journal
+*.pc
+*.mo
+*.edj
+
+CMakeCache.txt
+CMakeFiles
+install_manifest.txt
+cmake_install.cmake
+Makefile
+
+documentation.list
+

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 9b2759c..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,278 +0,0 @@
-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
-  * Open Domain setting menu
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Tue, 15 Jan 2013 15:01:39 +0900
-
-wrt-setting (0.0.27) unstable; urgency=low
-
-  * Prevent Issue
-
- -- kyungeun <lke01.lee@samusung.com>  Tue, 08 Jan 2013 13:52:12 +0900
-
-wrt-setting (0.0.26) unstable; urgency=low
-
-  * Apply vconf key path builder
-  * Add developer options menu
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.26
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Wed, 02 Jan 2013 14:52:53 +0900
-
-wrt-setting (0.0.25) unstable; urgency=low
-
-  * Open "Advanced Settings" menu
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.25
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Fri, 28 Dec 2012 17:30:14 +0900
-
-wrt-setting (0.0.24) unstable; urgency=low
-
-  * Advanced Setting menu style Change box to genlist
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.24
-
- -- leerang <leerang.song@samsung.com>  Wed, 26 Dec 2012 13:18:16 +0900
-
-wrt-setting (0.0.23) unstable; urgency=low
-
-  * Change string to STMS
-  * More detail menu style Change box to genlist
-  * Remove es_US.po and add es_MX.po
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.23
-
--- leerang <leerang.song@samsung.com>  Tue, 18 Dec 2012 17:03:52 +0900
-
-wrt-setting (0.0.22) unstable; urgency=low
-
-  * Delete auto save ID/password menu in More detail
-  * Fixed build break
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.22
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Mon, 10 Dec 2012 13:46:36 +0900
-
-wrt-setting (0.0.21) unstable; urgency=low
-
-  * Two Indicator Issue 
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.21
-
- -- kyungeun <lke01.lee@samsung.com>  Mon, 26 Nov 2012 21:12:26 +0900
-
-wrt-setting (0.0.20) unstable; urgency=low
-
-  * Implement Security Settings menu
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.20
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Fri, 23 Nov 2012 10:39:13 +0900
-
-wrt-setting (0.0.19) unstable; urgency=low
-
-   * popup for cookie sharing menu
-
-   * Git : apps/home/wrt-setting
-   * Tag : wrt-setting_0.0.19
-
- -- kyungeun <lke01.lee@samsung.com>  Thu, 22 Nov 2012 19:26:12 +0900
-
-wrt-setting (0.0.18) unstable; urgency=low
-
-   * Change string to STMS
-   * entry selector & popup issue
-   * The lib & rsc pathes has been changed
-   * Icon and String path has been changed
-   * Security header has been changed
-   * Add po file and po file list in CmakeList.txt
-
-   * Git : apps/home/wrt-setting
-   * Tag : wrt-setting_0.0.18
-
- -- leerang <leerang.song@samsung.com>  Fri, 16 Nov 2012 21:26:25 +0900
-
-wrt-setting (0.0.15) unstable; urgency=low
-
-  * Add std DEFINITIONS
-
- * Git : apps/home/wrt-setting
- * Tag : wrt-setting_0.0.15
-
- -- Leerang Song <leerang.song@samsung.com>  Thu, 18 Oct 2012 15:51:52 +0900
-
-wrt-setting (0.0.14) unstable; urgency=low
-
-  * Add license installing
-
-  * Git : apps/home/wrt-setting
-  * Tag : wrt-setting_0.0.14
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Fri, 12 Oct 2012 08:22:47 +0900
-
-wrt-setting (0.0.13) unstable; urgency=low
-
-  * Genlist style set for space between header and option
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.13
-
- -- SongERang <leerang.song@samsung.com>  Mon, 08 Oct 2012 09:38:40 +0900
-
-wrt-setting (0.0.12) unstable; urgency=low
-
-  * Adjusted spec and CMake to new dependencies
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.12
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Wed, 26 Sep 2012 20:22:04 +0900
-
-wrt-setting (0.0.11) unstable; urgency=low
-
-  * Genlist style set for webapplication list menu
-  * Add smack manifest
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.11
-
-
- -- Soyoung Kim <sy037.kim@samsung.com>  Thu, 20 Sep 2012 20:15:47 +0900
-
-wrt-setting (0.0.10) unstable; urgency=low
-
-  * genlist style set for webapplication list menu
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.10
-
- -- Leerang Song <leerang.song@samsung.com>  Tue, 07 Aug 2012 17:34:00 +0900
-
-wrt-setting (0.0.9) unstable; urgency=low
-
-  * All the things related with webkit1 is deleted
-  * As UI-GADGET-1 Change, API getting pkgname change from bundle_get_val
-  * it enalbes cookie sharing menu
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.9
-
- -- Leerang.song  <leerang.song@samsung.com>  Mon, 06 Aug 2012 15:32:28 +0900
-
-wrt-setting (0.0.8) unstable; urgency=low
-
-  * API related UG change to Managed API
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.8
-
- -- Leerang Song <leerang.song@samsung.com>  Wed, 18 Jul 2012 19:20:30 +0900
-
-wrt-setting (0.0.7) unstable; urgency=low
-
-  * Compiler flags change instead of LDFLAGS
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.7
-
- -- Leerang Song <leerang.song@samsung.com>  Wed, 18 Jul 2012 09:42:20 +0900
-
-wrt-setting (0.0.6) unstable; urgency=low
-
-  * add linker option for deleting Debug & Symbol information
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.6
-
- -- Leerang Song <leerang.song@samsung.com>  Mon, 16 Jul 2012 16:58:59 +0900
-
-wrt-setting (0.0.5) unstable; urgency=low
-
-  * Fixed build error in OBS
-  * adding menu for Save login ID/PWD & clear data in detail setting UG
-  * Boilerplate is updated
-  * Remove WK1
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.5
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Tue, 19 Jun 2012 09:58:53 +0900
-
-wrt-setting (0.0.4) unstable; urgency=low
-
-  * Boilerplate is updated
-  * Added a license information item into More details
-  * add Web Application menu
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.4
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Thu, 24 May 2012 18:47:01 +0900
-
-wrt-setting (0.0.3) unstable; urgency=low
-
-  * fix build error relating with APP_TYPE_WAC10
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.3
-
- -- kyungeun <lke01.lee@samsung.com>  Fri, 04 May 2012 14:13:26 +0900
-
-wrt-setting (0.0.2) unstable; urgency=low
-
-  * add menu for changing webkitmode
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.2
-
- -- Jihoon Chung <jihoon.chung@samsung.com>  Thu, 26 Apr 2012 23:05:32 +0900
-
-wrt-setting (0.0.1) unstable; urgency=low
-
-  * Initial draft
-
-  * Git : slp/pkgs/w/wrt-setting
-  * Tag : wrt-setting_0.0.1
-
- -- Wonguk Jeong <wonguk.jeong@samsung.com>  Fri, 16 Mar 2012 14:27:00 +0900

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index bbf9912..0000000
--- a/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: wrt-setting
-Section: devel
-Priority: extra
-Maintainer: Kyungeun Lee <lke01.lee@samsung.com>, Wonguk Jeong <wonguk.jeong@samsung.com>
-Build-Depends: debhelper (>= 5), libelm-dev, libelm-webview-dev, libecore-dev, libeina-dev, libui-gadget-dev, wrt-commons-dev (>= 0.2.25), wrt-security-dev (>=0.0.16)
-Standards-Version: 3.9.2
-
-Package: wrt-setting
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Setting UI Gadgets of WRT
-
-Package: wrt-setting-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, wrt-setting (= ${Source-Version})
-Description: Setting UI Gadgets of WRT (debug symbols)

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index c5a5b2e..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-PACKAGE_VERSION ?= $(shell dpkg-parsechangelog | sed -n 's/^Version: // p')
-PACKAGE_API_VERSION ?= $(firstword $(subst ., ,$(PACKAGE_VERSION)))
-
-PREFIX ?= /usr
-DATADIR ?= /opt
-LDFLAGS += --Wl,--rpath=$(PREFIX)/lib --Wl,--as-needed
-CMAKE_BUILD_DIR ?= $(CURDIR)/cmake_build_tmp
-
-configure-stamp:
-       dh_testdir
-       mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && \
-       CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-       cmake ${SRCDIR}                                                                 \
-               -DCMAKE_INSTALL_PREFIX="${PREFIX}"                                      \
-               -DUG_INSTALL_PREFIX="${DATADIR}"                                        \
-               -DPROJECT_API_VERSION="$(PACKAGE_API_VERSION)"\
-               -DPROJECT_VERSION="${PACKAGE_VERSION}" .. && \
-       touch $@
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-       dh_testdir
-       cd $(CMAKE_BUILD_DIR) && $(MAKE) -j4
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               cat $$f > $${f%.in}; \
-               sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-               sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-       done
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       rm -rf $(CMAKE_BUILD_DIR)
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-       cd $(CMAKE_BUILD_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=wrt-setting-dbg
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

diff --git a/debian/wrt-setting.install.in b/debian/wrt-setting.install.in
deleted file mode 100644 (file)
index 60afb69..0000000
--- a/debian/wrt-setting.install.in
+++ /dev/null
@@ -1 +0,0 @@
-/opt/ug/*

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index d1eeea5..26e485c 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.32
+Version: 0.0.33
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries
@@ -7,24 +7,23 @@ License: Flora Software License
 Source0: %{name}-%{version}.tar.gz
 
 BuildRequires: edje-bin
-BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: edje-tools
+BuildRequires: cmake
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(dpl-wrt-dao-ro)
 BuildRequires: pkgconfig(dpl-wrt-dao-rw)
-BuildRequires: pkgconfig(security)
-BuildRequires: pkgconfig(security-dao-rw)
 BuildRequires: pkgconfig(dpl-efl)
+BuildRequires: pkgconfig(security-settings)
 
 %description
 WRT Setting UI Gadgets
 
 %prep
 %setup -q
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DUG_INSTALL_PREFIX=/opt -DPROJECT_API_VERSION=0 -DPROJECT_VERSION=%{version}
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DUG_INSTALL_PREFIX=/usr -DPROJECT_API_VERSION=0 -DPROJECT_VERSION=%{version}
 
 %build
 make %{?jobs:-j%jobs}
@@ -45,6 +44,5 @@ rm -rf %{buildroot}
 /etc/smack/accesses2.d/ug.webapp-detail-efl.include
 %defattr(-,root,root,-)
 %{_datadir}/license/%{name}
-/opt/ug/*
-#/usr/ug/lib/*
+/usr/ug/lib/*
 /usr/ug/res/*

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1727733..415397f
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -371,8 +371,8 @@ void DetailView::clearDataCallback(void *data,
 }
 
 void DetailView::viewlicenseCallback(void *data,
-                                     Evas_Object *obj,
-                                     void *event_info)
+       Evas_Object *obj,
+       void *event_info)
 {
     Evas_Object *popup;
     Evas_Object *btn;
@@ -382,7 +382,6 @@ void DetailView::viewlicenseCallback(void *data,
     it = static_cast<Elm_Object_Item *>(event_info);
     Assert(it);
     elm_genlist_item_selected_set(it, EINA_FALSE);
-    Assert(data);
     detailData = static_cast<DetailData *>(data);
 
     popup = elm_popup_add(detailData->m_detailView->m_naviframe);

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
old mode 100755 (executable)
new mode 100644 (file)
index d8dd3f5..b4c6429
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -16,6 +16,7 @@
 
 #include "exceptionsview.h"
 
+#include <map>
 #include <vector>
 #include <string>
 #include <cstring>
@@ -24,6 +25,7 @@
 #include <dpl/foreach.h>
 #include <dpl/assert.h>
 #include <dpl/string.h>
+#include <dpl/wrt-dao-ro/widget_dao_types.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <wrt-commons/security-origin-dao/security_origin_dao.h>
 
@@ -45,8 +47,12 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_DEFAULT = "default";
 const char* const ELM_GENLIST_ITEM_CLASS_STYLE_3TEXT_1ICON = "3text.1icon";
 const char* const EVAS_SMART_CALLBACK_CLICKED = "clicked";
 // TEXT
-std::vector<std::string> featureText =
-    {"Geolocation", "Web Notification", "Web database", "FileSystem API"};
+std::map<WrtDB::Feature, std::string>  featureText = {
+    {WrtDB::FEATURE_GEOLOCATION, "Geolocation"},
+    {WrtDB::FEATURE_WEB_NOTIFICATION, "Web Notification"},
+    {WrtDB::FEATURE_USER_MEDIA, "User Media"},
+    {WrtDB::FEATURE_FULLSCREEN_MODE, "Fullscreen Mode"}
+};
 std::vector<std::string> resultText = {"Allow", "Deny"};
 const unsigned int INDEX_TEXT_ALLOW = 0;
 const unsigned int INDEX_TEXT_DENY = 1;
@@ -188,17 +194,12 @@ char* ExceptionsView::getTextCallback(
         return strdup(
             featureText[settingsData->m_originData.feature].c_str());
     } else if (partStr == ELM_PART_TEXT_2) {
-        // display host text
-        if (DPL::ToUTF8String(settingsData->m_originData.origin.scheme) ==
-                SCHEME_FILE)
-        {
-            // in case of file scheme, display "local"
-            return strdup(TEXT_LOCAL);
-        } else {
-            return strdup(
-                DPL::ToUTF8String(
-                    settingsData->m_originData.origin.host).c_str());
+        std::string url = DPL::ToUTF8String(settingsData->m_originData.origin.scheme);
+        if (!url.empty()) {
+            url += "://";
         }
+        url += DPL::ToUTF8String(settingsData->m_originData.origin.host);
+        return strdup(url.c_str());
     } else if (partStr == ELM_PART_TEXT_3) {
         // display result text
         Result result =