From: jomui Date: Tue, 8 Aug 2017 09:56:53 +0000 (+0900) Subject: fix as commercial engineer's request X-Git-Tag: submit/tizen/20170808.100834^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcffba06d919fc739e294deab6d8050713ffa768;p=platform%2Fcore%2Flocation%2Fmaps-plugin-here.git fix as commercial engineer's request Signed-off-by: jomui Change-Id: I3598d7a823da9f29cf5854b9eee5897972420eb3 --- diff --git a/heremaps-uc/resources/po/CMakeLists.txt b/heremaps-uc/resources/po/CMakeLists.txt index b0d08f0..a79085a 100644 --- a/heremaps-uc/resources/po/CMakeLists.txt +++ b/heremaps-uc/resources/po/CMakeLists.txt @@ -1,5 +1,5 @@ # for i18n -SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de.po el.po el_GR.po en.po en_GB.po en_PH.po en_US.po es.po es_MX.po es_US.po et.po eu.po fi.po fr.po fr_CA.po ga.po gl.po hi.po hr.po hu.po hy.po is.po it.po it_IT.po ja.po ja_JP.po ka.po kk.po ko.po ko_KR.po lt.po lv.po mk.po nb.po nl.po pl.po pt.po pt_BR.po pt_PT.po ro.po ru.po ru_RU.po sk.po sl.po sr.po sv.po tr.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po) +SET(POFILES ar.po az.po bg.po ca.po cs.po da.po de.po el.po el_GR.po en.po en_GB.po en_PH.po en_US.po es.po es_MX.po es_US.po et.po eu.po fi.po fr.po fr_CA.po ga.po gl.po he.po hi.po hr.po hu.po hy.po is.po it.po it_IT.po ja.po ja_JP.po ka.po kk.po ko.po ko_KR.po lt.po lv.po mk.po nb.po nl.po pl.po pt.po pt_BR.po pt_PT.po ro.po ru.po ru_RU.po sk.po sl.po sr.po sv.po tr.po tr_TR.po uk.po uz.po zh_CN.po zh_HK.po zh_SG.po zh_TW.po) SET(MSGFMT "/usr/bin/msgfmt") diff --git a/src/heremaps-uc-dbus.c b/src/heremaps-uc-dbus.c index 194eeba..ba1b8f1 100644 --- a/src/heremaps-uc-dbus.c +++ b/src/heremaps-uc-dbus.c @@ -13,6 +13,7 @@ * limitations under the License. */ +#include #include #include "heremaps-uc-dbus.h" @@ -67,33 +68,38 @@ EXPORT_API int heremaps_uc_dbus_launch_receiver() g_error_free(error); error = NULL; } - return HEREMAPS_UC_DBUS_ERROR_CONNECTION; - } - MAPS_LOGD("handle->conn: %p", handle->conn); - g_free(bus_addr); - - handle->service_name = g_strdup(UC_RECEIVER_NAME); - handle->service_path = g_strdup(UC_RECEIVER_PATH); - handle->signal_path = g_strdup_printf("%s/%s", handle->service_path, "SAMSUNG"); - MAPS_LOGD("Object Path [%s]", handle->signal_path); - - proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, handle->service_name, handle->signal_path, UC_INTERFACE_NAME, NULL, NULL); - if (proxy) { - MAPS_LOGD("proxy: %p", proxy); - g_object_unref(proxy); + app_control_h app_control = NULL; + app_control_create(&app_control); + app_control_set_app_id(app_control, "org.tizen.heremaps-uc"); + app_control_send_launch_request(app_control, NULL, NULL); + app_control_destroy(app_control); } else { - if (error) { - MAPS_LOGD("Fail to get proxy Error[%s]", error->message); - g_error_free(error); + MAPS_LOGD("handle->conn: %p", handle->conn); + + handle->service_name = g_strdup(UC_RECEIVER_NAME); + handle->service_path = g_strdup(UC_RECEIVER_PATH); + handle->signal_path = g_strdup_printf("%s/%s", handle->service_path, "SAMSUNG"); + MAPS_LOGD("Object Path [%s]", handle->signal_path); + + proxy = g_dbus_proxy_new_sync(handle->conn, G_DBUS_PROXY_FLAGS_NONE, NULL, handle->service_name, handle->signal_path, UC_INTERFACE_NAME, NULL, NULL); + if (proxy) { + MAPS_LOGD("proxy: %p", proxy); + g_object_unref(proxy); + } else { + if (error) { + MAPS_LOGD("Fail to get proxy Error[%s]", error->message); + g_error_free(error); + } } + MAPS_LOGD("g_dbus_proxy_new_sync is done"); } - MAPS_LOGD("g_dbus_proxy_new_sync is done"); if (handle->conn) { g_object_unref(handle->conn); handle->conn = NULL; MAPS_LOGD("g_object_unref : handle->conn"); } + g_free(bus_addr); g_free(handle->service_path); g_free(handle->service_name); g_free(handle->signal_path);