bug fix for launch popup

Change-Id: I2d0547b3ac7fa2e7410808cda825a22f664c8490

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index cc5ce67..16be3bc 100644 (file)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.0.42
+Version:    0.0.43
 Release:    0
 Group:      libs
 License:    Flora Software License
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(pmapi)
 BuildRequires: pkgconfig(pkgmgr)
 BuildRequires: pkgconfig(pkgmgr-info)
 BuildRequires: pkgconfig(ecore-x)
-BuildRequires: pkgconfig(capi-appfw-app-manager)
 BuildRequires: cmake
 BuildRequires: gettext-tools
 Requires(post):   /sbin/ldconfig

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index cda3e65..5f50597 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -14,7 +14,7 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(manager_pkges REQUIRED aul glib-2.0 gobject-2.0 security-server dbus-glib-1 vconf dlog tapi appsvc libcurl bluetooth-api heynoti smartcard-service smartcard-service-common libssl pmapi svi capi-media-wav-player pkgmgr pkgmgr-info ecore-x capi-appfw-app-manager)
+pkg_check_modules(manager_pkges REQUIRED aul glib-2.0 gobject-2.0 security-server dbus-glib-1 vconf dlog tapi appsvc libcurl bluetooth-api heynoti smartcard-service smartcard-service-common libssl pmapi svi capi-media-wav-player pkgmgr pkgmgr-info ecore-x)
 
 FOREACH(flag ${manager_pkges_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/src/manager/net_nfc_app_util.c b/src/manager/net_nfc_app_util.c
index ec6530e..583c8da 100644 (file)
--- a/src/manager/net_nfc_app_util.c
+++ b/src/manager/net_nfc_app_util.c
@@ -34,7 +34,6 @@
 #include "aul.h"
 #include "vconf.h"
 #include "Ecore_X.h"
-#include "app_manager.h"
 
 #include "net_nfc_typedef.h"
 #include "net_nfc_typedef_private.h"
@@ -910,24 +909,6 @@ int net_nfc_app_util_decode_base64(const char *buffer, uint32_t buf_len, uint8_t
        return ret;
 }
 
-static pid_t _net_nfc_app_util_get_current_app_pid()
-{
-       char *app_id = NULL;
-       app_context_h context = NULL;
-       pid_t pid, pgid;
-
-       pid = getpid();
-       app_manager_get_app_id(pid, &app_id);
-       app_manager_get_app_context(app_id, &context);
-
-       app_context_get_pid(context, &pgid);
-
-       free(app_id);
-       app_context_destroy(context);
-
-       return pgid;
-}
-
 static pid_t _net_nfc_app_util_get_focus_app_pid()
 {
        Ecore_X_Window focus;
@@ -944,16 +925,15 @@ static pid_t _net_nfc_app_util_get_focus_app_pid()
 
 bool net_nfc_app_util_check_launch_state()
 {
-       pid_t focus_app_pid, current_app_pid;
+       pid_t focus_app_pid;
        net_nfc_launch_popup_state_e popup_state;
        bool result = false;
 
-       current_app_pid = _net_nfc_app_util_get_current_app_pid();
        focus_app_pid = _net_nfc_app_util_get_focus_app_pid();
 
-       popup_state = net_nfc_server_get_client_popup_state(current_app_pid);
+       popup_state = net_nfc_server_get_client_popup_state(focus_app_pid);
 
-       if(popup_state == NET_NFC_NO_LAUNCH_APP_SELECT && current_app_pid == focus_app_pid)
+       if(popup_state == NET_NFC_NO_LAUNCH_APP_SELECT)
                result = true;
 
        return result;