[Clock-viewer] Reset the clock resource id when clock is relaunched

Change-Id: I1d077b8175e0188a7bbbe44b1c639b99e652e763

diff --git a/clock-viewer/org.tizen.w-clock-viewer.xml.in b/clock-viewer/org.tizen.w-clock-viewer.xml.in
index 6c9fc50c98288d79936408369f4ffa6fedd8d506..922b220caf636f0133421c70596861ed5714af15 100644 (file)
--- a/clock-viewer/org.tizen.w-clock-viewer.xml.in
+++ b/clock-viewer/org.tizen.w-clock-viewer.xml.in
@@ -13,5 +13,6 @@
                <privilege>http://tizen.org/privilege/display</privilege>
                <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
                <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
+               <privilege>http://tizen.org/privilege/widget.viewer</privilege>
        </privileges>
 </manifest>

diff --git a/clock-viewer/src/clock-viewer.c b/clock-viewer/src/clock-viewer.c
index 5eab223af309a7944590347648752922f3252259..ad044d63145fa424461ed5fffc4097a14071a03f 100644 (file)
--- a/clock-viewer/src/clock-viewer.c
+++ b/clock-viewer/src/clock-viewer.c
@@ -394,8 +394,10 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer)
                return;
        }
 
+       resource_id = clock_viewer_util_pkginfo_get_clock_resource_id();
+
        if (s_info.clock_pkgname) {
-               if (!strcmp(s_info.clock_pkgname, pkgname) && s_info.resource_id) {
+               if (!strcmp(s_info.clock_pkgname, pkgname) && s_info.resource_id == resource_id) {
                        _WARN("same pkgname(%s), skip!", pkgname);
                        free(pkgname);
                        return;
@@ -404,7 +406,6 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer)
                _DBG("First time\n");
        }
 
-       resource_id = clock_viewer_util_pkginfo_get_clock_resource_id();
        if (!resource_id) {
                _ERR("resource id is not valid\n");
                ambient_type = CLOCK_VIEWER_AMBIENT_TYPE_ANALOG;
@@ -545,7 +546,6 @@ HAPI void clock_viewer_show(clock_viewer_s *clock_viewer, int is_hide_launch)
 
                        s_info.is_clock_resumed = 1;
                } else {
-                       evas_object_move(win, clock_viewer->win_width - 1, clock_viewer->win_height - 1);
                        evas_object_show(win);
                }
 
@@ -568,7 +568,6 @@ HAPI void clock_viewer_show(clock_viewer_s *clock_viewer, int is_hide_launch)
                        evas_object_resize(win, clock_viewer->win_width, clock_viewer->win_height);
                        evas_object_show(win);
                } else {
-                       evas_object_move(win, clock_viewer->win_width - 1, clock_viewer->win_height - 1);
                        evas_object_show(win);
                }