Merge commit 'refs/changes/94/42094/2' of ssh://review.tizen.org:29418/platform/core...

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
	lib/media-util-db.c

Change-Id: I53824601191edb36d2f4166312d54dd023ead8b6

diff --cc src/server/media-server-thumb.c
index e7db58d,35e3628..4702b47
--- 1/src/server/media-server-thumb.c
--- 2/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@@ -126,11 -124,11 +124,13 @@@ void _ms_thumb_create_timer(int id
  /* This checks if thumbnail server is running */
  bool _ms_thumb_check_process()
  {
++#if 0
        DIR *pdir;
        struct dirent pinfo;
        struct dirent *result = NULL;
++#endif
        bool ret = FALSE;
--
++#if 0
        pdir = opendir("/proc");
        if (pdir == NULL) {
                MS_DBG_ERR("err: NO_DIR");
@@@ -166,7 -164,7 +166,7 @@@
        }
  
        closedir(pdir);
--
++#endif
        return ret;
  }
  
@@@ -231,12 -229,12 +231,11 @@@ int _media_thumb_get_error(
  {
        if (errno == EWOULDBLOCK) {
                MS_DBG_ERR("Timeout. Can't try any more");
--#if 0
                if (!_ms_thumb_check_process()) {
                        MS_DBG_ERR("Thumbnail server is not running!. Reset info for thumb server to execute");
                        ms_thumb_reset_server_status();
                }
--#endif
++
                return MS_MEDIA_ERR_SOCKET_RECEIVE_TIMEOUT;
        } else {
                MS_DBG_STRERROR("recvfrom failed");