merge with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29905f9..6cbc88e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,10 +52,10 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-pie")
 
 ADD_CUSTOM_TARGET(app-selector.edj
-               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/images  
-               ${CMAKE_SOURCE_DIR}/app-selector.edc ${CMAKE_BINARY_DIR}/app-selector.edj  
-               DEPENDS ${CMAKE_SOURCE_DIR}/app-selector.edc   
-)  
+               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/images
+               ${CMAKE_SOURCE_DIR}/app-selector.edc ${CMAKE_BINARY_DIR}/app-selector.edj
+               DEPENDS ${CMAKE_SOURCE_DIR}/app-selector.edc
+)
 ADD_DEPENDENCIES(${PROJECT_NAME} app-selector.edj)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})

diff --git a/app-selector-view.c b/app-selector-view.c
index bfb1d5e..4530583 100755 (executable)
--- a/app-selector-view.c
+++ b/app-selector-view.c
@@ -35,24 +35,6 @@
 
 extern int aul_forward_app(const char* pkgname, bundle *kb);
 
-static Eina_Bool __unload_info_popup(void *data);
-static void __default_app_set_cb(void *data, Evas_Object * obj, 
-                                       void *event_info);
-static void __launch_set_default_app_popup(struct _select_app_info *info);
-static void __response_cb(void *data, Evas_Object * obj, void *event_info);
-static void __clear_app_list(void *data);
-static int __app_list_get_with_mimetype(void *data);
-static Eina_Bool __gl_state_get(const void *data, Evas_Object * obj,
-                              const char *part);
-static void __gl_del(const void *data, Evas_Object * obj);
-static void __gl_sel(void *data, Evas_Object * obj, void *event_info);
-static Evas_Object *__gl_content_get(const void *data, Evas_Object * obj,
-                                const char *part);
-static char *__gl_text_get(const void *data, Evas_Object * obj,
-                          const char *part);
-static void __app_genlist_item_append(struct appdata *ad);
-static Evas_Object *__app_genlist_add(struct appdata *ad);
-
 static Eina_Bool __unload_info_popup(void *data)
 {
 /*     Evas_Object *eo = (Evas_Object *) data;
@@ -65,29 +47,13 @@ static Eina_Bool __unload_info_popup(void *data)
        return ECORE_CALLBACK_CANCEL;
 }
 
-void load_info_popup(struct appdata *ad, char *str)
-{
-       Evas_Object *eo = NULL;
-       eo = elm_popup_add(ad->win);
-       evas_object_size_hint_weight_set(eo, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       elm_object_text_set(eo, str);
-
-       ecore_timer_add(2.0, __unload_info_popup, eo);
-       evas_object_show(eo);
-}
-
 static void __default_app_set_ok_cb(void *data, Evas_Object * obj,
                                        void *event_info)
 {
-       char *scheme = NULL;
-       char *host = NULL;
-       char *uri_r_info = NULL;
-       bundle *outb;
        int ret;
        SoupURI *s_uri;
-       char *val = NULL;
-       
+       const char *val = NULL;
+
        if (!data)
                return;
 
@@ -200,8 +166,8 @@ static void __launch_set_default_app_popup(struct _select_app_info *info)
        popup = elm_popup_add(ad->win);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
-       elm_object_text_set(popup, dgettext("app-selector", "IDS_TASKMGR_POP_SET_AS_DEFAULT_Q"));
-       elm_object_part_text_set(popup, "title,text", dgettext("app-selector", "IDS_TASKMGR_HEADER_DEFAULT_APPLICATION_SETTINGS"));
+       elm_object_text_set(popup, _("IDS_TASKMGR_POP_SET_AS_DEFAULT_Q"));
+       elm_object_part_text_set(popup, "title,text", _("IDS_TASKMGR_HEADER_DEFAULT_APPLICATION_SETTINGS"));
 
        btn1 = elm_button_add(popup);
        elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_OK"));
@@ -212,8 +178,6 @@ static void __launch_set_default_app_popup(struct _select_app_info *info)
        elm_object_part_content_set(popup, "button2", btn2);
        evas_object_smart_callback_add(btn2, "clicked", __default_app_set_calcel_cb, info);
 
-       ad->def_set_popup = popup;
-
        evas_object_show(popup);
 
 }
@@ -279,15 +243,15 @@ static ail_cb_ret_e __iter_func(
 
        ail_appinfo_get_str(appinfo, AIL_PROP_ICON_STR, &str);
        info->app_icon_path = strdup(str);
-       
+
        printf("PKGNAME : %s, ICONPATH : %s\n", info->pkg_name,
                       info->app_icon_path);
 
        info->ad = ad;
 
        ad->app_list = eina_list_append(ad->app_list, info);
-       
-       return AIL_CB_RET_CONTINUE;     
+
+       return AIL_CB_RET_CONTINUE;
 }
 
 
@@ -300,7 +264,7 @@ static int __app_list_get_with_mimetype(void *data)
        ail_error_e ret;
 
        ret = ail_filter_new(&filter);
-       if (ret != AIL_ERROR_OK) 
+       if (ret != AIL_ERROR_OK)
                return -1;
 
        ret = ail_filter_add_str(filter, AIL_PROP_MIMETYPE_STR, ad->mime_type);
@@ -316,7 +280,7 @@ static int __app_list_get_with_mimetype(void *data)
                ail_filter_destroy(filter);
                return -1;
        }
-       
+
        ail_filter_destroy(filter);
 
        return 0;
@@ -348,7 +312,7 @@ static int __iterate(const char* pkg_name, void *data)
 
        ail_appinfo_get_str(handle, AIL_PROP_ICON_STR, &str);
        info->app_icon_path = strdup(str);
-       
+
        printf("PKGNAME : %s, ICONPATH : %s\n", info->pkg_name,
                       info->app_icon_path);
 
@@ -360,7 +324,7 @@ static int __iterate(const char* pkg_name, void *data)
        if (ret != AIL_ERROR_OK) {
                return -1;
        }
-       
+
        return 0;
 }
 
@@ -368,17 +332,10 @@ static int __iterate(const char* pkg_name, void *data)
 static int __app_list_get_with_control(void *data)
 {
        struct appdata *ad = data;
-       struct _select_app_info *info;
        bundle *kb;
 
-       char *scheme = NULL;
-       char *tmp = NULL;
-       char op_mime[1024] = {0,};
-       char op_scheme[1024] = {0,};
-
        kb = bundle_create();
-       if(kb == NULL)
-       {
+       if(kb == NULL) {
                _E("bundle creation fail\n");
                return -1;
        }
@@ -406,13 +363,13 @@ static int __app_list_get_with_control(void *data)
        return 0;
 }
 
-static Eina_Bool __gl_state_get(const void *data, Evas_Object * obj,
+static Eina_Bool __gl_state_get(void *data, Evas_Object * obj,
                               const char *part)
 {
        return EINA_FALSE;
 }
 
-static void __gl_del(const void *data, Evas_Object * obj)
+static void __gl_del(void *data, Evas_Object * obj)
 {
        return;
 }
@@ -437,7 +394,7 @@ static void __gl_sel(void *data, Evas_Object * obj, void *event_info)
        }
 }
 
-Evas_Object *_add_layout(Evas_Object *parent, const char *file,
+Evas_Object *__add_layout(Evas_Object *parent, const char *file,
                              const char *group)
 {
        Evas_Object *eo = NULL;
@@ -462,13 +419,13 @@ Evas_Object *_add_layout(Evas_Object *parent, const char *file,
        return eo;
 }
 
-static Evas_Object *__gl_content_get(const void *data, Evas_Object * obj,
+static Evas_Object *__gl_content_get(void *data, Evas_Object * obj,
                                 const char *part)
 {
        struct _select_app_info *info = (struct _select_app_info *)data;
        char buf[PATH_LEN] = { 0, };
 
-       Evas_Object *icon;
+       Evas_Object *icon = NULL;
        Evas_Object *rt, *icon_ly = NULL;
        double scale = elm_config_scale_get();
 
@@ -479,12 +436,12 @@ static Evas_Object *__gl_content_get(const void *data, Evas_Object * obj,
                                 (const char *)ICON_PATH
                                 "/icon_app-selector.png");
 
-               
+
                if (!strncmp(&buf[strlen(buf) - 3], "edj", 3)) {
-                       icon_ly = _add_layout(obj, buf, "icon");
-                       icon = _add_layout(obj, EDJ_NAME, "icon");
+                       icon_ly = __add_layout(obj, buf, "icon");
+                       icon = __add_layout(obj, EDJ_NAME, "icon");
                        rt = evas_object_rectangle_add(evas_object_evas_get(obj));
-                       
+
                        evas_object_color_set(rt, 0, 0, 0, 0);
                        evas_object_size_hint_min_set(rt, (int)(50.0 * scale),
                                                      (int)(50.0 * scale));
@@ -493,21 +450,21 @@ static Evas_Object *__gl_content_get(const void *data, Evas_Object * obj,
                        elm_object_part_content_set(icon, "icon_ly", rt);
 
                        elm_object_part_content_set(icon, "icon", icon_ly);
-               
+
                } else {
                        icon = elm_icon_add(obj);
-                       elm_icon_file_set(icon, buf, NULL);
+                       elm_image_file_set(icon, buf, NULL);
                        evas_object_size_hint_aspect_set(icon,
                                                 EVAS_ASPECT_CONTROL_VERTICAL,
                                                 1, 1);
-               }               
-               
+               }
+
                return icon;
        }
        return NULL;
 }
 
-static char *__gl_text_get(const void *data, Evas_Object * obj,
+static char *__gl_text_get(void *data, Evas_Object * obj,
                           const char *part)
 {
        struct _select_app_info *info = (struct _select_app_info *)data;
@@ -568,7 +525,7 @@ static Evas_Object *__app_genlist_add(struct appdata *ad)
        return genlist;
 }
 
-void load_app_list(struct appdata *ad)
+static void __load_app_list(struct appdata *ad)
 {
        Evas_Object *popup;
        Evas_Object *btn1;
@@ -579,7 +536,8 @@ void load_app_list(struct appdata *ad)
 
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
-       elm_object_part_text_set(popup, "title,text", dgettext("app-selector", "IDS_TASKMGR_HEADER_SELECT_APPLICATION"));
+
+       elm_object_part_text_set(popup, "title,text", _("IDS_TASKMGR_HEADER_SELECT_APPLICATION"));
 
        btn1 = elm_button_add(popup);
        elm_object_text_set(btn1, dgettext("sys_string", "IDS_COM_SK_CANCEL"));
@@ -597,6 +555,18 @@ void load_app_list(struct appdata *ad)
        evas_object_show(popup);
 }
 
+void load_info_popup(struct appdata *ad, char *str)
+{
+       Evas_Object *eo = NULL;
+       eo = elm_popup_add(ad->win);
+       evas_object_size_hint_weight_set(eo, EVAS_HINT_EXPAND,
+                                        EVAS_HINT_EXPAND);
+       elm_object_text_set(eo, str);
+
+       ecore_timer_add(2.0, __unload_info_popup, eo);
+       evas_object_show(eo);
+}
+
 void update_app_list(struct appdata *ad)
 {
        int ret = -1;
@@ -619,18 +589,18 @@ void update_app_list(struct appdata *ad)
 void load_app_select_popup(struct appdata *ad)
 {
        int ret = -1;
-       
+
        if(ad->mime_type)
-               ret = __app_list_get_with_mimetype(ad); 
+               ret = __app_list_get_with_mimetype(ad);
        else if(ad->control_op)
                ret = __app_list_get_with_control(ad);
-       
+
        if (ret == -1)
        {
                printf("fail fail fail\n");
                return;
        }
        else
-               load_app_list(ad);
+               __load_app_list(ad);
 
 }

diff --git a/app-selector.c b/app-selector.c
index 274a0db..9285da0 100755 (executable)
--- a/app-selector.c
+++ b/app-selector.c
@@ -15,7 +15,6 @@
  */
 
 
-
 #include <stdio.h>
 #include <appcore-efl.h>
 #include <Ecore_X.h>
@@ -31,19 +30,11 @@
 #include "app-selector-view.h"
 #include "app-selector-util.h"
 
-int is_reset = 0;
-
-
-static void __win_del(void *data, Evas_Object * obj, void *event);
-static Evas_Object *__create_win(const char *name);
-static Evas_Object *__create_layout_main(Evas_Object * parent);
-static int __app_create(void *data);
-static int __app_init_with_bundle(void *data);
-static int __app_terminate(void *data);
-static int __app_pause(void *data);
-static int __app_resume(void *data);
-static int __app_reset(bundle *b, void *data);
+#ifndef EXPORT_API
+#define EXPORT_API __attribute__ ((visibility("default")))
+#endif
 
+int is_reset = 0;
 
 static void __win_del(void *data, Evas_Object * obj, void *event)
 {
@@ -142,8 +133,6 @@ static int __x_rotation_get(Display *dpy, Window win)
        int rotation = -1;
        int ret;
 
-       int angles[2];
-
        Atom atom_active_win;
        Atom atom_win_rotate_angle;
 
@@ -176,7 +165,7 @@ static int __x_rotation_get(Display *dpy, Window win)
 
 static int __as_rotate(Display *dpy, Window xwin, Evas_Object *win, void *data)
 {
-       int rotation;   
+       int rotation;
        struct appdata *ad = data;
 
        ecore_x_icccm_hints_set(xwin, 0, 0, 0, 0, 0, 0, 0);
@@ -203,7 +192,7 @@ static Eina_Bool __rotate(void *data, int type, void *event)
                return ECORE_CALLBACK_RENEW;
 
        if (ev->message_type == ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE)
-               __as_rotate(ad->dpy, ad->xwin, ad->win, ad);    
+               __as_rotate(ad->dpy, ad->xwin, ad->win, ad);
 
        return 0;
 }
@@ -225,7 +214,7 @@ Eina_Bool __key_press_cb(void *data, int type, void *event)
                 _E("Invalid event object");
                 return ECORE_CALLBACK_RENEW;
         }
-       
+
                ecore_event_handler_del(ad->rotate);
                ad->rotate = NULL;
                elm_exit();
@@ -235,11 +224,9 @@ Eina_Bool __key_press_cb(void *data, int type, void *event)
 
 static void __register_key_handler(void *data)
 {
-        Ecore_X_Window win;
         struct appdata *ad = (struct appdata *)data;
-        win = elm_win_xwindow_get(ad->win);
 
-        ad->key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, 
+        ad->key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP,
                                                                                         __key_press_cb, ad);
         if (!ad->key_up) {
                 _E("Failed to register a key down event handler");
@@ -251,56 +238,46 @@ static void __register_key_handler(void *data)
 
 static void __unregister_key_handler(void *data)
 {
-        Ecore_X_Window win;
-        struct appdata *ad = (struct appdata *)data;
+       struct appdata *ad = (struct appdata *)data;
 
-        if (ad->key_up) {
-                ecore_event_handler_del(ad->key_up);
-                ad->key_up = NULL;
-                               ad->rotate = NULL;
-        }
+       if (ad->key_up) {
+               ecore_event_handler_del(ad->key_up);
+               ad->key_up = NULL;
+               ad->rotate = NULL;
+       }
 
-        _D("Unregister key handler is invoked");
-        s_key_registered = EINA_FALSE;
+       _D("Unregister key handler is invoked");
+       s_key_registered = EINA_FALSE;
 }
 
 static void __grab_home_key(void *data)
 {
-        Ecore_X_Window win;
-        struct appdata *ad = (struct appdata *)data;
+       struct appdata *ad = (struct appdata *)data;
 
-        win = elm_win_xwindow_get(ad->win);
-        utilx_grab_key(ecore_x_display_get(), win, KEY_HOME, SHARED_GRAB);
+       _D("Grab home key.");
 
-        _D("Grab home key.");
+       utilx_grab_key(ad->dpy, ad->xwin, KEY_HOME, SHARED_GRAB);
 
-               __register_key_handler(ad);
+       __register_key_handler(ad);
 }
 
 static void __ungrab_home_key(void *data)
 {
-        Ecore_X_Window win;
-        struct appdata *ad = (struct appdata *)data;
+       struct appdata *ad = (struct appdata *)data;
 
-               __unregister_key_handler(ad);
+       __unregister_key_handler(ad);
 
-        win = elm_win_xwindow_get(ad->win);
-        utilx_ungrab_key(ecore_x_display_get(), win, KEY_HOME);
+       _D("Ungrab home key.");
 
-        _D("Ungrab home key.");
+       utilx_ungrab_key(ad->dpy, ad->xwin, KEY_HOME);
 }
 
-
-
 static int __app_create(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
        Evas_Object *win;
        Evas_Object *ly;
        int r;
-       Display *dpy;
-       Ecore_X_Window xwin;
-       
 
        /* create window */
        win = __create_win(PACKAGE);
@@ -314,7 +291,6 @@ static int __app_create(void *data)
                return -1;
 
        edje_object_signal_emit(_EDJ(ly), "elm,bg,show,transparent", "elm");
-       ad->ly_main = ly;
 
        elm_win_resize_object_add(win, ly);
 
@@ -322,17 +298,16 @@ static int __app_create(void *data)
        ad->xwin = elm_win_xwindow_get(win);
 
        ad->rotate = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
-                                                        __rotate, (void *)ad); 
+                                                        __rotate, (void *)ad);
 
        __as_rotate(ad->dpy, ad->xwin, win, ad);
 
-//     evas_object_show(ly);
        evas_object_show(win);
 
        /* init internationalization */
        r = appcore_set_i18n(PACKAGE, LOCALEDIR);
        if (r)
-               return -1;      
+               return -1;
 
        __grab_home_key(ad);
 
@@ -392,8 +367,6 @@ static int __app_pause(void *data)
 
 static int __app_resume(void *data)
 {
-       /*struct appdata *ad = data; */
-
        return 0;
 }
 
@@ -423,10 +396,6 @@ static int __app_reset(bundle *b, void *data)
                load_info_popup(ad, _("Cannot get mimetype!"));
                return 0;
        }
-
-/*      ad->mime_type = "text"; */
-/*      ad->parent_pid = 0000; */
-
        /*
           If AUL_K_ARGV0 is not NULL, the situation is launching(fork & exec).
           else the situation is being received a reset event(old relaunch evet)
@@ -440,7 +409,7 @@ static int __app_reset(bundle *b, void *data)
        return 0;
 }
 
-int main(int argc, char *argv[])
+EXPORT_API main(int argc, char *argv[])
 {
        struct appdata ad;
        struct appcore_ops ops = {

diff --git a/app-selector.h b/app-selector.h
index 1db0f81..51a5bef 100755 (executable)
--- a/app-selector.h
+++ b/app-selector.h
@@ -27,7 +27,7 @@
 
 
 #undef LOG_TAG
-#define LOG_TAG "app-selector"
+#define LOG_TAG "APP-SELECTOR"
 
 #define _E(fmt, arg...) LOGE("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg)
 #define _D(fmt, arg...) LOGD("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg)
@@ -51,13 +51,11 @@
 
 struct appdata {
        Evas_Object *win;
-       Evas_Object *ly_main;
 
        Ecore_Event_Handler *key_up;
        Ecore_Event_Handler *rotate;
 
        Evas_Object *popup;
-       Evas_Object *def_set_popup;
 
        Eina_List *app_list;
        Evas_Object *app_genlist;

diff --git a/packaging/org.tizen.app-selector.spec b/packaging/org.tizen.app-selector.spec
index db83a4e..388e934 100755 (executable)
--- a/packaging/org.tizen.app-selector.spec
+++ b/packaging/org.tizen.app-selector.spec
@@ -2,7 +2,7 @@
 Name:       org.tizen.app-selector
 Summary:    Application selector
 Version:    0.1.0
-Release:    83
+Release:    84
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License
 Source0:    %{name}-%{version}.tar.gz