apply tizen2.1 appcontrol

[apps/core/preloaded/phone-contacts.git] / lib / list / ct-list-main.c

diff --git a/lib/list/ct-list-main.c b/lib/list/ct-list-main.c
index c746788..9cdc8cc 100755 (executable)
--- a/lib/list/ct-list-main.c
+++ b/lib/list/ct-list-main.c
@@ -150,36 +150,29 @@ static int __list_parse_bundle_by_operation(service_h service, ct_list_data* cli
                clist_d->ug_request = CT_UG_REQUEST_UPDATE_CONTACT;
                clist_d->list_op = CT_GET_LIST_PERSON_OF_WRITABLE_ADDRBOOK_ID;
 
-               service_get_extra_data(service, CT_OPERATION_PHONE, &val);
-               if(val) {
+               service_get_extra_data(service, CT_OPERATION_PHONE, &val1);
+               if(val1) {
                        clist_d->ug_request = CT_UG_REQUEST_UPDATE_WITH_NUM;
-                       clist_d->ug_data = val;
+                       clist_d->ug_data = val1;
                        return 1;
                }
-               service_get_extra_data(service, CT_OPERATION_EMAIL, &val);
-               if(val) {
+
+               service_get_extra_data(service, CT_OPERATION_EMAIL, &val1);
+               if(val1) {
                        clist_d->ug_request = CT_UG_REQUEST_UPDATE_WITH_EMAIL;
-                       clist_d->ug_data = val;
+                       clist_d->ug_data = val1;
                        return 1;
                }
-               service_get_extra_data(service, CT_OPERATION_URL, &val);
-               if(val) {
+
+               service_get_extra_data(service, CT_OPERATION_URL, &val1);
+               if(val1) {
                        clist_d->ug_request = CT_UG_REQUEST_UPDATE_WITH_WEB;
-                       clist_d->ug_data = val;
+                       clist_d->ug_data = val1;
                        return 1;
                }
        }
        else if(strcmp(operation, CT_OPERATION_SOCIAL_PICK) == 0) {
                service_get_extra_data(service, CT_OPERATION_ITEM_TYPE, &val);
-               if(strcmp(val, CT_OPERATION_ITEM_TYPE_PERSON) != 0) {
-                       ERR("CT_OPERATION_ITEM_TYPE_PERSON not matched %s", val);
-                       free(val);
-                       return -1;
-               }
-               free(val);
-               val = NULL;
-
-               service_get_extra_data(service, CT_OPERATION_ITEM_TYPE, &val);
                if(val) {
                        if(strcmp(val, CT_OPERATION_ITEM_TYPE_PERSON) != 0) {
                                ERR("CT_OPERATION_ITEM_TYPE_PERSON not matched %s", val);
@@ -267,6 +260,10 @@ static int __list_parse_bundle_by_operation(service_h service, ct_list_data* cli
                        }
                        free(val);
                }
+               else {
+                       ERR("CT_OPERATION_SELECTION_MODE is mandatory");
+                       return -1;
+               }
        }
        else {
                ERR("operation wrong");