From 20eaa25053b188bf9ae42d3e1533fd94b38d6ed7 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Tue, 27 Dec 2016 16:54:13 +0900 Subject: [PATCH] Revert "Temporary fix for hybrid pkg installation" This reverts commit 7e8901a3d5cf426a17222c3c6be87f41ef9855cc. Conflicts: include/pkgmgrinfo_basic.h src/pkgmgrinfo_basic.c Now hybrid installer can merge manifest completely. Submit with: - https://review.tizen.org/gerrit/107236 - https://review.tizen.org/gerrit/107237 - https://review.tizen.org/gerrit/107238 - https://review.tizen.org/gerrit/107239 Change-Id: Id6262ca978129c028ed09a4102252a03b7658c2b Signed-off-by: Sangyoon Jang --- include/pkgmgrinfo_basic.h | 7 ------- src/pkgmgrinfo_basic.c | 15 --------------- 2 files changed, 22 deletions(-) diff --git a/include/pkgmgrinfo_basic.h b/include/pkgmgrinfo_basic.h index fbc05af..275fe65 100644 --- a/include/pkgmgrinfo_basic.h +++ b/include/pkgmgrinfo_basic.h @@ -100,12 +100,6 @@ typedef struct splashscreen_x { char *color_depth; } splashscreen_x; -/* FIXME: For temporary hotfix, will be removed */ -typedef struct support_size_x { - char *preview; - char *size; -} support_size_x; - typedef struct privilege_x { char *type; char *value; @@ -173,7 +167,6 @@ typedef struct application_x { GList *background_category; /*element*/ GList *appcontrol; /*element*/ GList *splashscreens; /*element*/ - GList *support_sizes; /* FIXME */ } application_x; typedef struct package_x { diff --git a/src/pkgmgrinfo_basic.c b/src/pkgmgrinfo_basic.c index 292291b..cd683ce 100644 --- a/src/pkgmgrinfo_basic.c +++ b/src/pkgmgrinfo_basic.c @@ -221,19 +221,6 @@ static void __ps_free_splashscreen(gpointer data) free((void *)splashscreen); } -/* FIXME */ -static void __ps_free_support_size(gpointer data) -{ - support_size_x *support_size = (support_size_x *)data; - if (support_size == NULL) - return; - if (support_size->preview) - free((void *)support_size->preview); - if (support_size->size) - free((void *)support_size->size); - free((void *)support_size); -} - static void __ps_free_privilege(gpointer data) { privilege_x *privilege = (privilege_x *)data; @@ -375,8 +362,6 @@ static void __ps_free_application(gpointer data) g_list_free_full(application->background_category, free); /*Free SplashScreen*/ g_list_free_full(application->splashscreens, __ps_free_splashscreen); - /* FIXME */ - g_list_free_full(application->support_sizes, __ps_free_support_size); free((void *)application); } -- 2.7.4