diff options
author | hyun lee <hyunn.lee@samsung.com> | 2014-08-29 15:09:16 +0900 |
---|---|---|
committer | hyun lee <hyunn.lee@samsung.com> | 2014-08-29 15:09:16 +0900 |
commit | c5370b37b1e84e2040e6a412aa0bee65646832bd (patch) | |
tree | e3efdf63d847e2e458975525bdddfb1facffa5e5 | |
parent | 3b2c238f9a12c234b6db0c7721909dcbdb79212b (diff) | |
download | shortcut-c5370b37b1e84e2040e6a412aa0bee65646832bd.tar.gz shortcut-c5370b37b1e84e2040e6a412aa0bee65646832bd.tar.bz2 shortcut-c5370b37b1e84e2040e6a412aa0bee65646832bd.zip |
Merge from tizen_2.3b
Change-Id: I57f48e54d66307b885209dfc680318130f2d01ff
Signed-off-by: hyun lee <hyunn.lee@samsung.com>
-rwxr-xr-x | lib/src/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/src/main.c b/lib/src/main.c index 5ec06d4..a94f000 100755 --- a/lib/src/main.c +++ b/lib/src/main.c @@ -316,6 +316,10 @@ static inline int make_connection(void) EAPI int shortcut_set_request_cb(request_cb_t request_cb, void *data) { + if (request_cb == NULL) { + return SHORTCUT_ERROR_INVALID_PARAMETER; + } + s_info.server_cb.request_cb = request_cb; s_info.server_cb.data = data; @@ -325,6 +329,7 @@ EAPI int shortcut_set_request_cb(request_cb_t request_cb, void *data) ret = vconf_notify_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb, NULL); if (ret < 0) { ErrPrint("Failed to add vconf for service state [%d]\n", ret); + return SHORTCUT_ERROR_COMM; } else { DbgPrint("vconf is registered\n"); } |