Tizen 2.4.0 rev3 SDK Public Release

diff --git a/include/list.h b/include/list.h
index be7b248..a45dc65 100644 (file)
--- a/include/list.h
+++ b/include/list.h
@@ -19,7 +19,7 @@
 
 #include <Elementary.h>
 
-Eina_List *_list_create(share_panel_h share_panel);
+Eina_List *_list_create(app_control_h control, bundle *b);
 void _list_destroy(Eina_List *list);
 
 #endif /* __TIZEN_SHARE_PANEL_LIST_H__ */

diff --git a/include/share_panel_internal.h b/include/share_panel_internal.h
index 2cd4753..307d144 100644 (file)
--- a/include/share_panel_internal.h
+++ b/include/share_panel_internal.h
@@ -58,7 +58,6 @@ struct _share_panel {
        int page_height;
        int show_state;
        int list_count;
-       int after_launch;
 };
 typedef struct _share_panel share_panel_s;
 
@@ -66,7 +65,6 @@ typedef struct _share_panel share_panel_s;
 
 struct _item {
        bundle *b;
-       share_panel_s *share_panel;
 
        char *appid;
        char *name;

diff --git a/res/edje/layout.edc b/res/edje/layout.edc
index 878a9a5..c925925 100644 (file)
--- a/res/edje/layout.edc
+++ b/res/edje/layout.edc
@@ -150,22 +150,6 @@ collections {
                                        fixed: 1 1;
                                }
                        }
-                       part {
-                               name: "blocker";
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.to: "bg";
-                                       rel2.to: "bg";
-                                       visible: 0;
-                                       color: 255 255 255 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
                }
                programs {
                        program {
@@ -182,20 +166,6 @@ collections {
                                action: STATE_SET "1line,land" 0.0;
                                target: "fixed_bg";
                        }
-                       program {
-                               name: "block,hide";
-                               signal: "hide";
-                               source: "blocker";
-                               action: STATE_SET "default" 0.0;
-                               target: "blocker";
-                       }
-                       program {
-                               name: "block,show";
-                               signal: "show";
-                               source: "blocker";
-                               action: STATE_SET "show" 0.0;
-                               target: "blocker";
-                       }
                }
        } //group
 } //collections

diff --git a/src/grid.c b/src/grid.c
index 5c8c80e..34893ee 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -145,7 +145,6 @@ static void __item_selected(void *data, Evas_Object *obj, void *event_info)
        ret_if(!item_info);
        ret_if(!item_info->appid);
        ret_if(!item_info->b);
-       ret_if(!item_info->share_panel);
        _D("item clicked, launch app : %s", item_info->appid);
 
        selected_item = elm_gengrid_selected_item_get(obj);
@@ -158,8 +157,7 @@ static void __item_selected(void *data, Evas_Object *obj, void *event_info)
                _E("Fail to launch app(%d)", ret);
        }
 
-       item_info->share_panel->after_launch = 1;
-       elm_object_signal_emit(item_info->share_panel->ui_manager, "show", "blocker");
+       ui_app_exit();
 }
 
 

diff --git a/src/list.c b/src/list.c
index 4378ee6..6f343f8 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include <mime_type.h>
 
-#include "share_panel.h"
 #include "share_panel_internal.h"
 #include "log.h"
 
@@ -207,12 +206,10 @@ static void __trim_uri(app_control_h control)
 
 
 
-#define CONTACT_MIME "application/vnd.tizen.contact"
 static void __create_multi_share_list(app_control_h control, Eina_List **matchlist)
 {
        char **data_array = NULL;
        char *mime = NULL;
-       char *contact_mime = NULL;
        char *uri = NULL;
        Eina_List *mime_list = NULL;
 
@@ -220,17 +217,9 @@ static void __create_multi_share_list(app_control_h control, Eina_List **matchli
        int length = 0;
        int res;
 
-       app_control_get_mime(control, &contact_mime);
-
-       if (contact_mime && !strcmp(contact_mime, CONTACT_MIME)) {
-               _D("caller is contact");
-               __intersect_match_list_with_mime(matchlist, contact_mime, uri);
-               return;
-       } else {
-               res = app_control_get_extra_data_array(control, TIZEN_DATA_PATH, &data_array, &length);
-               if (res != APP_CONTROL_ERROR_NONE) {
-                       _E("app_control_get_extra_data_array failed..[%d]", res);
-               }
+       res = app_control_get_extra_data_array(control, TIZEN_DATA_PATH, &data_array, &length);
+       if (res != APP_CONTROL_ERROR_NONE) {
+               _E("app_control_get_extra_data_array failed..[%d]", res);
        }
        for (i = 0; i < length; i++) {
                Eina_List *l = NULL;
@@ -283,14 +272,13 @@ static int __applist_compare(const void *com1, const void *com2)
 
 
 
-static void __make_applist(share_panel_h share_panel, Eina_List *matchlist, Eina_List **applist)
+static void __make_applist(bundle *b, Eina_List *matchlist, Eina_List **applist)
 {
        Eina_List *l;
        char *data = NULL;
        int ret = 0;
 
-       ret_if(!share_panel);
-       ret_if(!share_panel->b);
+       ret_if(!b);
 
        EINA_LIST_FOREACH(matchlist, l, data) {
                item_s *app_s = NULL;
@@ -305,8 +293,7 @@ static void __make_applist(share_panel_h share_panel, Eina_List *matchlist, Eina
                        free(app_s);
                        continue;
                }
-               app_s->b = share_panel->b;
-               app_s->share_panel = share_panel;
+               app_s->b = b;
 
                ret = app_info_create(data, &app_info);
                if (ret != APP_MANAGER_ERROR_NONE || !app_info) {
@@ -348,35 +335,34 @@ static void __make_applist(share_panel_h share_panel, Eina_List *matchlist, Eina
 
 
 
-Eina_List *_list_create(share_panel_h share_panel)
+Eina_List *_list_create(app_control_h control, bundle *b)
 {
        Eina_List *matchlist = NULL;
        Eina_List *applist  = NULL;
        char *operation_type = NULL;
        char *data = NULL;
 
-       retv_if(!share_panel, NULL);
-       retv_if(!share_panel->control, NULL);
-       retv_if(!share_panel->b, NULL);
+       retv_if(!control, NULL);
+       retv_if(!b, NULL);
 
-       app_control_get_operation(share_panel->control, &operation_type);
+       app_control_get_operation(control, &operation_type);
        retv_if(!operation_type, NULL);
 
-       __trim_uri(share_panel->control);
+       __trim_uri(control);
 
        if (!strcmp(operation_type, TIZEN_SHARE)
                || !strcmp(operation_type, TIZEN_SHARE_TEXT)) {
                _D("single share operation");
-               __create_single_share_list(share_panel->control, &matchlist);
+               __create_single_share_list(control, &matchlist);
        } else if (!strcmp(operation_type, TIZEN_MULTI_SHARE)) {
                _D("multi share operation");
-               __create_multi_share_list(share_panel->control, &matchlist);
+               __create_multi_share_list(control, &matchlist);
        } else {
                _D("Wrong operation");
                return NULL;
        }
 
-       __make_applist(share_panel, matchlist, &applist);
+       __make_applist(b, matchlist, &applist);
 
        EINA_LIST_FREE(matchlist, data) {
                free(data);

diff --git a/src/share_panel.c b/src/share_panel.c
index 5007744..f5d7a8b 100644 (file)
--- a/src/share_panel.c
+++ b/src/share_panel.c
@@ -181,7 +181,6 @@ EAPI int share_panel_create(app_control_h control, share_panel_h *share_panel)
        panel->page_height = ELM_SCALE_SIZE(SCROLLER_HEIGHT);
 
        panel->control = control;
-       panel->after_launch = 0;
 
        panel->ui_manager = _ui_manager_create(panel);
        goto_if(!panel->ui_manager, ERROR);
@@ -285,11 +284,8 @@ static void _app_control(app_control_h control, void *data)
 
 static void _pause_cb(void *data)
 {
-       share_panel_h *share_panel = data;
-       _D("share_panel is paused");
+       _D("");
 
-       if ((*share_panel)->after_launch)
-               ui_app_exit();
 }
 
 

diff --git a/src/ui_manager.c b/src/ui_manager.c
index 5c135e9..d1da698 100644 (file)
--- a/src/ui_manager.c
+++ b/src/ui_manager.c
@@ -212,7 +212,7 @@ Evas_Object *_ui_manager_create(share_panel_s *share_panel)
                _E("cannot register the scroller event");
        }
 
-       share_panel->list = _list_create(share_panel);
+       share_panel->list = _list_create(share_panel->control, share_panel->b);
        if (!share_panel->list) {
                notification_status_message_post(_("IDS_BT_POP_NO_APPLICATIONS_AVAILABLE_TO_OPEN_FILES"));
                ui_app_exit();