summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-04-02 10:40:09 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-04-02 10:41:01 (GMT)
commit0989d4c5efce87d500ba34db14fcc9f7627b4304 (patch)
treecffc29a80f8db0ceee7406de08a9b2c3f40f96a2
parent8f7486dcac9783bd8db01582a8767a24541af5e6 (diff)
parentcb24bba4d077d98f4f57935488d32a26f6acce63 (diff)
downloadug-wifi-direct-0989d4c5efce87d500ba34db14fcc9f7627b4304.zip
ug-wifi-direct-0989d4c5efce87d500ba34db14fcc9f7627b4304.tar.gz
ug-wifi-direct-0989d4c5efce87d500ba34db14fcc9f7627b4304.tar.bz2
Merge branch 'master' into tizen_2.1
Change-Id: I4b952aec81c51e1772887809222fb57085107ab9
-rwxr-xr-xdebian/changelog8
-rwxr-xr-xpackaging/libug-setting-wifidirect-efl.spec2
-rwxr-xr-xpopup-wifidirect/src/wfd-app-popup-view.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f66e7b0..89cad48 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (1.0.12) precise; urgency=low
+
+ * Fix bug N_SE-32347(wrong string)
+ * Git: rsa/apps/home/ug-wifi-direct
+ * Tag: libug-setting-wifidirect-efl_1.0.12
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com> Thu, 02 Apr 2013 16:30:29 +0900
+
ug-setting-wifidirect-efl (1.0.11) precise; urgency=low
* Fix bug N_SE-29625, N_SE-30229, N_SE-30234
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 3ccf6f6..46183de 100755
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
Name: libug-setting-wifidirect-efl
Summary: Wi-Fi Direct setting UI gadget
-Version: 1.0.11
+Version: 1.0.12
Release: 1
Group: TO_BE_FILLED
License: Flora License
diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index 091b88f..c6459b8 100755
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -138,7 +138,8 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
WDPOP_LOGD(
"wifi_direct_accept_connection() failed. result=[%d]\n", result);
/* tickernoti popup */
- wfd_tickernoti_popup(IDS_WFD_POP_CONNECT_FAILED);
+ snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name);
+ wfd_tickernoti_popup(msg);
}
}
break;