Merge branch 'tizen_3.0' into tizen

Change-Id: I605a7a5146a0cc0441c4df5839173836534ce63c
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 4c11b79..3f5f24b 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -401,7 +401,7 @@ BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-network-wifi-manager)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(libpcrecpp)
-BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-appfw-app-common)
 BuildRequires: pkgconfig(capi-appfw-app-manager)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(capi-content-media-content)
@@ -432,10 +432,21 @@ BuildRequires: pkgconfig(accounts-svc)
 %endif
 
 %if 0%{?tizen_feature_alarm_support}
+BuildRequires: pkgconfig(capi-appfw-app-control)
+BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-appfw-alarm)
 BuildRequires: pkgconfig(alarm-service)
 %endif
 
+%if 0%{?tizen_feature_application_support}
+BuildRequires: pkgconfig(capi-appfw-app-control)
+BuildRequires: pkgconfig(capi-appfw-event)
+%endif
+
+%if 0%{?tizen_feature_bluetooth_support}
+BuildRequires: pkgconfig(capi-appfw-app-control)
+%endif
+
 %if 0%{?tizen_feature_bookmark_support}
 BuildRequires: pkgconfig(capi-web-bookmark)
 BuildRequires: pkgconfig(bookmark-adaptor)
@@ -474,6 +485,7 @@ BuildRequires: pkgconfig(capi-appfw-application)
 
 %if 0%{?tizen_feature_push_support}
 BuildRequires: pkgconfig(push)
+BuildRequires: pkgconfig(capi-appfw-app-control)
 %endif
 
 %if 0%{?tizen_feature_key_manager_support}
@@ -513,6 +525,7 @@ BuildRequires:  pkgconfig(libexif)
 
 %if 0%{?tizen_feature_nfc_support}
 BuildRequires:  pkgconfig(capi-network-nfc)
+BuildRequires:  pkgconfig(capi-appfw-app-control)
 %endif
 
 %if 0%{?tizen_feature_fm_radio_support}
@@ -533,6 +546,11 @@ BuildRequires: pkgconfig(capi-message-port)
 
 %if 0%{?tizen_feature_notification_support}
 BuildRequires: pkgconfig(notification)
+BuildRequires: pkgconfig(capi-appfw-app-control)
+%endif
+
+%if 0%{?tizen_feature_preference_support}
+BuildRequires: pkgconfig(capi-appfw-preference)
 %endif
 
 %if 0%{?tizen_feature_sound_support}

diff --git a/src/alarm/alarm.gyp b/src/alarm/alarm.gyp
index dc1135a..66eb77b 100644 (file)
--- a/src/alarm/alarm.gyp
+++ b/src/alarm/alarm.gyp
@@ -25,6 +25,8 @@
           'variables': {
             'packages': [
               'capi-appfw-alarm',
+              'capi-appfw-app-control',
+              'capi-appfw-application',
             ]
           },
         }],

diff --git a/src/application/application.gyp b/src/application/application.gyp
index 40b614f..7a222ba 100644 (file)
--- a/src/application/application.gyp
+++ b/src/application/application.gyp
@@ -33,7 +33,8 @@
             'packages': [
               'aul',
               'capi-appfw-app-manager',
-              'capi-appfw-application',
+              'capi-appfw-app-control',
+              'capi-appfw-event',
               'capi-appfw-package-manager',
               'pkgmgr',
               'pkgmgr-info',

diff --git a/src/bluetooth/bluetooth.gyp b/src/bluetooth/bluetooth.gyp
index 72eb206..8981306 100644 (file)
--- a/src/bluetooth/bluetooth.gyp
+++ b/src/bluetooth/bluetooth.gyp
@@ -50,6 +50,7 @@
          'variables': {
             'packages': [
               'capi-network-bluetooth',
+              'capi-appfw-app-control',
               'capi-system-info',
               'libpcrecpp',
             ]

diff --git a/src/common/common.gyp b/src/common/common.gyp
index 7f4e78e..64404f8 100644 (file)
--- a/src/common/common.gyp
+++ b/src/common/common.gyp
@@ -68,7 +68,7 @@
           'variables': {
             'packages': [
               'capi-appfw-app-manager',
-              'capi-appfw-application',
+              'capi-appfw-app-common',
               'capi-appfw-package-manager',
               'storage',
               'security-privilege-manager',

diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc
index 4ad3807..c00109b 100644 (file)
--- a/src/convergence/convergence_instance.cc
+++ b/src/convergence/convergence_instance.cc
@@ -412,7 +412,11 @@ common::TizenResult ConvergenceInstance::RemoteAppControlServiceLaunchAppControl
                                          static_cast<int>(ConvergenceUtils::GetArg(args, kJSCurrentListenerId).get<double>()));
     }
 
-    this->Post(token, result);
+    //only in case of failure call callback
+    //other cases are handled by conv_service_listener_cb()
+    if (!result) {
+      this->Post(token, result);
+    }
   };
 
   std::thread(launch_app_control, token).detach();

diff --git a/src/convergence/convergence_remote_app_control_service.cc b/src/convergence/convergence_remote_app_control_service.cc
index cdd1716..23bb6b6 100644 (file)
--- a/src/convergence/convergence_remote_app_control_service.cc
+++ b/src/convergence/convergence_remote_app_control_service.cc
@@ -128,6 +128,7 @@ TizenResult ConvergenceRemoteAppControlService::Disconnect() {
   }
 
   int error = conv_service_disconnect(service);
+
   if (CONV_ERROR_NONE != error) {
     return LogAndCreateTizenError(AbortError, "conv_service_disconnect [Fail]");
   } else {

diff --git a/src/convergence/convergence_utils.cc b/src/convergence/convergence_utils.cc
index bbe9a7c..f14cac2 100644 (file)
--- a/src/convergence/convergence_utils.cc
+++ b/src/convergence/convergence_utils.cc
@@ -97,6 +97,7 @@ common::TizenResult ConvergenceUtils::ConvertConvergenceError(int error) {
   }
 
   return common::TizenSuccess();
+
 }
 
 } // namespace convergence

diff --git a/src/nfc/nfc.gyp b/src/nfc/nfc.gyp
index 25b02f9..79597cd 100644 (file)
--- a/src/nfc/nfc.gyp
+++ b/src/nfc/nfc.gyp
@@ -34,7 +34,7 @@
             'packages': [
                 'capi-system-info',
                 'capi-network-nfc',
-                'capi-appfw-application'
+                'capi-appfw-app-control',
             ]
           },
         }],

diff --git a/src/notification/notification.gyp b/src/notification/notification.gyp
index 9c219a8..35fc135 100755 (executable)
--- a/src/notification/notification.gyp
+++ b/src/notification/notification.gyp
@@ -26,6 +26,7 @@
             'packages': [
               'notification',
               'capi-system-device',
+              'capi-appfw-app-control',
             ]
           },
         }],

diff --git a/src/preference/preference.gyp b/src/preference/preference.gyp
index 0b5161b..eedd0f4 100644 (file)
--- a/src/preference/preference.gyp
+++ b/src/preference/preference.gyp
@@ -22,7 +22,7 @@
         ['tizen == 1', {
           'variables': {
             'packages': [
-              'capi-appfw-application',
+              'capi-appfw-preference',
             ]
           },
         }],

diff --git a/src/push/push.gyp b/src/push/push.gyp
index 5cdb2ad..6028465 100644 (file)
--- a/src/push/push.gyp
+++ b/src/push/push.gyp
@@ -28,7 +28,7 @@
           'variables': {
             'packages': [
               'push',
-              'capi-appfw-application',
+              'capi-appfw-app-control',
               'libpcrecpp',
             ]
           },