projects
/
framework
/
web
/
wrt-plugins-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
078de86
)
Update wrt-plugins-common_0.3.54
2.0alpha
master
2.0_alpha
submit/master/20120920.151154
author
jihoon.chung
<jihoon.chung@samsung.com>
Wed, 29 Aug 2012 06:27:01 +0000
(15:27 +0900)
committer
jihoon.chung
<jihoon.chung@samsung.com>
Wed, 29 Aug 2012 06:27:01 +0000
(15:27 +0900)
CMakeLists.txt
patch
|
blob
|
history
debian/changelog
patch
|
blob
|
history
packaging/wrt-plugins-common.spec
patch
|
blob
|
history
src/modules/API/CMakeLists.txt
patch
|
blob
|
history
src/modules/packages/CMakeLists.txt
patch
|
blob
|
history
src/modules/tizen/CMakeLists.txt
patch
|
blob
|
history
src/modules/tizen/WidgetDB/WidgetDB.cpp
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
54639ef
..
b36642f
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-127,7
+127,6
@@
endmacro(configure_and_install_pkg)
configure_and_install_pkg(wrt-plugins-commons-javascript.pc)
configure_and_install_pkg(wrt-plugins-commons.pc)
configure_and_install_pkg(wrt-plugins-filesystem.pc)
configure_and_install_pkg(wrt-plugins-commons-javascript.pc)
configure_and_install_pkg(wrt-plugins-commons.pc)
configure_and_install_pkg(wrt-plugins-filesystem.pc)
-configure_and_install_pkg(wrt-plugins-mmplayer.pc)
configure_and_install_pkg(wrt-plugins-cpu.pc)
configure_and_install_pkg(wrt-plugins-widget-interface-dao.pc)
configure_and_install_pkg(wrt-plugins-widgetdb.pc)
configure_and_install_pkg(wrt-plugins-cpu.pc)
configure_and_install_pkg(wrt-plugins-widget-interface-dao.pc)
configure_and_install_pkg(wrt-plugins-widgetdb.pc)
diff --git
a/debian/changelog
b/debian/changelog
index
aa39f4a
..
1859a2b
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,13
@@
+wrt-plugins-common (0.3.54) unstable; urgency=low
+
+ * [Plugins] Code clean up
+ * [Plugins] Multiple INVALID_WIDGET_HANDLE definition
+
+ * Git : slp/pkgs/w/wrt-plugins-common
+ * Tag : wrt-plugins-common_0.3.54
+
+ -- Jihoon Chung <jihoon.chung@samsung.com> Wed, 29 Aug 2012 13:40:06 +0900
+
wrt-plugins-common (0.3.53) unstable; urgency=low
* Removed a unnecessary dependency.
wrt-plugins-common (0.3.53) unstable; urgency=low
* Removed a unnecessary dependency.
diff --git
a/packaging/wrt-plugins-common.spec
b/packaging/wrt-plugins-common.spec
index
398079d
..
f5297c7
100644
(file)
--- a/
packaging/wrt-plugins-common.spec
+++ b/
packaging/wrt-plugins-common.spec
@@
-1,7
+1,7
@@
-#sbs-git:slp/pkgs/w/wrt-plugins-common wrt-plugins-common 0.3.5
3
+#sbs-git:slp/pkgs/w/wrt-plugins-common wrt-plugins-common 0.3.5
4
Name: wrt-plugins-common
Summary: wrt-plugins common library
Name: wrt-plugins-common
Summary: wrt-plugins common library
-Version: 0.3.5
3
+Version: 0.3.5
4
Release: 1
Group: Development/Libraries
License: Apache License, Version 2.0
Release: 1
Group: Development/Libraries
License: Apache License, Version 2.0
diff --git
a/src/modules/API/CMakeLists.txt
b/src/modules/API/CMakeLists.txt
index
f93e3d7
..
6893517
100644
(file)
--- a/
src/modules/API/CMakeLists.txt
+++ b/
src/modules/API/CMakeLists.txt
@@
-13,7
+13,6
@@
# limitations under the License.
#
include_config_file(Filesystem)
# limitations under the License.
#
include_config_file(Filesystem)
-include_config_file(MMPlayer)
include_config_file(Cpu)
include_config_file(Widget)
include_config_file(LocalStorage)
include_config_file(Cpu)
include_config_file(Widget)
include_config_file(LocalStorage)
@@
-21,15
+20,3
@@
include_config_file(StorageEvent)
include_config_file(TizenServiceEvent)
include_config_file(WidgetDB)
include_config_file(PluginManager)
include_config_file(TizenServiceEvent)
include_config_file(WidgetDB)
include_config_file(PluginManager)
-#DEPRACATED modules
-#include_config_file(Networking)
-#include_config_file(Geolocation)
-#include_config_file(Display)
-#include_config_file(Gallery)
-#include_config_file(Telephony)
-#include_config_file(FeatureLoader)
-#include_config_file(AppLauncher)
-#include_config_file(Device)
-#include_config_file(Memory)
-#include_config_file(System)
-#include_config_file(UI)
diff --git
a/src/modules/packages/CMakeLists.txt
b/src/modules/packages/CMakeLists.txt
index
0f387c2
..
85b28b0
100644
(file)
--- a/
src/modules/packages/CMakeLists.txt
+++ b/
src/modules/packages/CMakeLists.txt
@@
-19,7
+19,6
@@
set(TARGET_MODULE_CALENDAR "wrt-plugins-calendar")
set(TARGET_MODULE_MESSAGING "wrt-plugins-messaging")
set(TARGET_MODULE_HAPTICS "wrt-plugins-haptics")
set(TARGET_MODULE_CONTACT "wrt-plugins-contact")
set(TARGET_MODULE_MESSAGING "wrt-plugins-messaging")
set(TARGET_MODULE_HAPTICS "wrt-plugins-haptics")
set(TARGET_MODULE_CONTACT "wrt-plugins-contact")
-set(TARGET_MODULE_MMPLAYER "wrt-plugins-mmplayer")
set(TARGET_MODULE_CPU "wrt-plugins-cpu")
set(TARGET_MODULE_ACCELEROMETER "wrt-plugins-accelerometer")
set(TARGET_MODULE_WIDGET "wrt-plugins-widget")
set(TARGET_MODULE_CPU "wrt-plugins-cpu")
set(TARGET_MODULE_ACCELEROMETER "wrt-plugins-accelerometer")
set(TARGET_MODULE_WIDGET "wrt-plugins-widget")
@@
-37,7
+36,6
@@
set(TARGET_MODULE_WIDGETDB "wrt-plugins-widgetdb")
set(TARGET_MODULE_PLUGIN_MANAGER "wrt-plugins-plugin-manager")
add_subdirectory(Filesystem)
set(TARGET_MODULE_PLUGIN_MANAGER "wrt-plugins-plugin-manager")
add_subdirectory(Filesystem)
-add_subdirectory(MMPlayer)
add_subdirectory(Cpu)
add_subdirectory(Widget)
add_subdirectory(LocalStorage)
add_subdirectory(Cpu)
add_subdirectory(Widget)
add_subdirectory(LocalStorage)
diff --git
a/src/modules/tizen/CMakeLists.txt
b/src/modules/tizen/CMakeLists.txt
index
f805b14
..
ce3b4d7
100644
(file)
--- a/
src/modules/tizen/CMakeLists.txt
+++ b/
src/modules/tizen/CMakeLists.txt
@@
-24,7
+24,6
@@
include_config_file(Filesystem)
include_config_file(Cpu)
include_config_file(Filesystem)
include_config_file(Cpu)
-include_config_file(MMPlayer)
include_config_file(Widget)
include_config_file(LocalStorage)
include_config_file(WidgetInterfaceDAO)
include_config_file(Widget)
include_config_file(LocalStorage)
include_config_file(WidgetInterfaceDAO)
diff --git
a/src/modules/tizen/WidgetDB/WidgetDB.cpp
b/src/modules/tizen/WidgetDB/WidgetDB.cpp
index
cb4d644
..
560aabd
100644
(file)
--- a/
src/modules/tizen/WidgetDB/WidgetDB.cpp
+++ b/
src/modules/tizen/WidgetDB/WidgetDB.cpp
@@
-41,9
+41,6
@@
#include "WidgetFeature.h"
#include "WidgetFeature.h"
-namespace { // anonymous
- const int INVALID_WIDGET_HANDLE = -1;
-} // namespace
namespace WrtDeviceApis {
namespace WidgetDB {
namespace WrtDeviceApis {
namespace WidgetDB {
@@
-222,23
+219,10
@@
Api::InstallationStatus WidgetDB::checkInstallationStatus(
const WrtDB::WidgetGUID w_guid =
WrtDB::WidgetGUID(DPL::FromUTF8String(gid));
const WrtDB::WidgetGUID w_guid =
WrtDB::WidgetGUID(DPL::FromUTF8String(gid));
- WrtDB::DbWidgetHandle widgetHandle = INVALID_WIDGET_HANDLE;
+ try {
+ WrtDB::DbWidgetHandle widgetHandle =
+ WrtDB::WidgetDAOReadOnly::getHandle(w_guid);
- WrtDB::DbWidgetHandleList widgetList = WrtDB::WidgetDAOReadOnly
- ::getHandleList();
-
- FOREACH(iterator, widgetList) {
- WrtDB::WidgetDAOReadOnly dao(*iterator);
- WrtDB::WidgetGUID d_guid = dao.getGUID();
- if (w_guid == d_guid) {
- widgetHandle = *iterator;
- }
- }
-
- // TODO check name
- if (INVALID_WIDGET_HANDLE == widgetHandle) {
- outStatus = Api::InstallationStatus::STATUS_UNINSTALLED;
- } else {
WrtDB::WidgetDAOReadOnly dao(widgetHandle);
DPL::OptionalString ver = dao.getVersion();
if (!ver || version > DPL::ToUTF8String(*ver)) {
WrtDB::WidgetDAOReadOnly dao(widgetHandle);
DPL::OptionalString ver = dao.getVersion();
if (!ver || version > DPL::ToUTF8String(*ver)) {
@@
-248,6
+232,8
@@
Api::InstallationStatus WidgetDB::checkInstallationStatus(
} else {
outStatus = Api::InstallationStatus::STATUS_LATEST;
}
} else {
outStatus = Api::InstallationStatus::STATUS_LATEST;
}
+ }catch (WrtDB::WidgetDAOReadOnly::Exception::WidgetNotExist) {
+ outStatus = Api::InstallationStatus::STATUS_UNINSTALLED;
}
}
Catch(DPL::Exception)
}
}
Catch(DPL::Exception)