summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2013-04-23 13:04:08 +0900
committerSung-jae Park <nicesj.park@samsung.com>2013-04-23 13:04:08 +0900
commit326017e6f984ffcf30a5ee86f6d9e27f506b1bce (patch)
tree476d0965b0feeadc9f5e71fc256b4e250d8efafb
parentf15210a9a2258a56d72ec5a90ce8ce72c83604e4 (diff)
downloadlivebox-viewer-accepted/tizen_2.1/20130425.023343.tar.gz
livebox-viewer-accepted/tizen_2.1/20130425.023343.tar.bz2
livebox-viewer-accepted/tizen_2.1/20130425.023343.zip
Change-Id: I010da9a1e62ae817ebfad84e8c2b982478ec01de
-rw-r--r--src/client.c4
-rw-r--r--src/fb.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/client.c b/src/client.c
index 403dd97..e4322bc 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1360,6 +1360,10 @@ const char *client_addr(void)
int client_fini(void)
{
+ int ret;
+ ret = vconf_ignore_key_changed(VCONFKEY_MASTER_STARTED, master_started_cb);
+ if (ret < 0)
+ DbgPrint("Ignore vconf key: %d\n", ret);
com_core_packet_client_fini(s_info.fd);
com_core_del_event_callback(CONNECTOR_DISCONNECTED, disconnected_cb, NULL);
com_core_del_event_callback(CONNECTOR_CONNECTED, connected_cb, NULL);
diff --git a/src/fb.c b/src/fb.c
index 305a0cc..10b90d9 100644
--- a/src/fb.c
+++ b/src/fb.c
@@ -559,7 +559,7 @@ int fb_size(struct fb_info *info)
return 0;
info->bufsz = info->w * info->h * s_info.depth;
- return info ? info->bufsz : 0;
+ return info->bufsz;
}
/* End of a file */