Replace wmanager.WATCH_CLOCK with wearable_clock

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I9d0080cd28bf01b69c88c17b1ebbac3ecd1bc31b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 470a697..a9f8447 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,7 @@ ADD_DEFINITIONS("-DINFO_SOCKET=\"/opt/usr/share/live_magazine/.live.socket\"")
 ADD_DEFINITIONS("-DCLIENT_SOCKET=\"/opt/usr/share/live_magazine/.client.socket\"")
 ADD_DEFINITIONS("-DSLAVE_SOCKET=\"/opt/usr/share/live_magazine/.slave.socket\"")
 ADD_DEFINITIONS("-DSERVICE_SOCKET=\"/opt/usr/share/live_magazine/.service.socket\"")
+ADD_DEFINITIONS("-DCATEGORY_WATCH_CLOCK=\"http://tizen.org/category/wearable_clock\"")
 
 ADD_DEFINITIONS("-DCLIENT_PORT=\"8208\"")
 

diff --git a/include/package.h b/include/package.h
index 8fc5de6..8922ac7 100644 (file)
--- a/include/package.h
+++ b/include/package.h
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define CATEGORY_WATCH_CLOCK   "org.tizen.wmanager.WATCH_CLOCK"
-
 enum alter_type {
        ALTER_CREATE,
        ALTER_DESTROY

diff --git a/pkgmgr_widget/common/src/common.c b/pkgmgr_widget/common/src/common.c
index 33f0e23..f1d24a3 100644 (file)
--- a/pkgmgr_widget/common/src/common.c
+++ b/pkgmgr_widget/common/src/common.c
@@ -43,7 +43,6 @@
 
 #define CUR_VER 5
 #define DEFAULT_CATEGORY       "http://tizen.org/category/default"
-#define WATCH_CATEGORY         "org.tizen.wmanager.WATCH_CLOCK"
 
 #if !defined(WIDGET_COUNT_OF_SIZE_TYPE)
 #define WIDGET_COUNT_OF_SIZE_TYPE 13
@@ -2177,7 +2176,7 @@ static int update_category(struct widget *widget, xmlNodePtr node)
                return 0;
        }
 
-       if (!xmlStrcasecmp(category, (const xmlChar *)WATCH_CATEGORY)) {
+       if (!xmlStrcasecmp(category, (const xmlChar *)CATEGORY_WATCH_CLOCK)) {
                ErrPrint("Widget tries to install WATCH: %s\n", widget->pkgid);
                return -EINVAL;
        }
@@ -3173,7 +3172,7 @@ int db_install_watchapp(xmlNodePtr node, const char *appid)
        widget->nodisplay = 1;
        widget->hw_acceleration = xmlStrdup((const xmlChar *)"use-sw"); //use-gl
        widget->abi = xmlStrdup((const xmlChar *)"app");
-       widget->category = xmlStrdup((const xmlChar *)WATCH_CATEGORY);
+       widget->category = xmlStrdup((const xmlChar *)CATEGORY_WATCH_CLOCK);
 
        widget->widget_type = WIDGET_TYPE_BUFFER;
        widget->default_mouse_event = 1;
@@ -3296,9 +3295,9 @@ int pkglist_get_via_callback(const char *appid, int is_watch_widget, void (*cb)(
        }
 
        if (is_watch_widget) { /* Watch */
-               dml = "SELECT pkgid, prime FROM pkgmap WHERE appid = ? AND category = '" WATCH_CATEGORY "'";
+               dml = "SELECT pkgid, prime FROM pkgmap WHERE appid = ? AND category = '" CATEGORY_WATCH_CLOCK "'";
        } else { /* Widget */
-               dml = "SELECT pkgid, prime FROM pkgmap WHERE appid = ? AND (category IS NULL OR category <> '" WATCH_CATEGORY "')";
+               dml = "SELECT pkgid, prime FROM pkgmap WHERE appid = ? AND (category IS NULL OR category <> '" CATEGORY_WATCH_CLOCK "')";
        }
 
        ret = sqlite3_prepare_v2(s_info.handle, dml, -1, &stmt, NULL);