Resolve the GWarning

 - VD's requirement

Change-Id: I4c2d45f147c585bbbf7c7ef1dc77031bb378ed42

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 653dad1e4c0fb880c26cb72876f9c30fb21e7802..b68586a822583a99301110a610508262a6c8ff1f 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.38
+Version:    0.3.39
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server.c b/server/src/muse_server.c
index 34d340e4b3dccfc1d515cdccb5d78f11e54567cd..e660ab8192eb5fad82bcf323c8f8c0fad87295aa 100644 (file)
--- a/server/src/muse_server.c
+++ b/server/src/muse_server.c
@@ -342,7 +342,8 @@ bool muse_server_ipc_get_data_info(char *data, uint64_t *data_id, int *size)
 intptr_t muse_server_ipc_get_handle(muse_module_h m)
 {
        g_return_val_if_fail(m, 0);
-       g_return_val_if_fail(m->handle, 0);
+       if (!m->handle)
+               return 0;
 
        return m->handle;
 }

diff --git a/server/src/muse_server_log.c b/server/src/muse_server_log.c
index 3d34fc6084ea957bb2e8e0bd58256ca9290005e7..ee3d9c4df78afdb484d5e20136e95c33971c39ee 100644 (file)
--- a/server/src/muse_server_log.c
+++ b/server/src/muse_server_log.c
@@ -259,7 +259,9 @@ static void _ms_log_set_fd(ms_log_t *log)
 {
        char err_msg[MUSE_MSG_LEN_MAX] = {'\0',};
 
-       g_return_if_fail(ms_is_log_enabled());
+       if (!ms_is_log_enabled())
+               return;
+
        g_return_if_fail(log);
 
        _ms_log_create_fd(log);

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 13044e4f59971ed69ecdefc89d14b62a837d1940..f97571ad62ff92e9de0fa7fd975c7e91c56d2a97 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -645,11 +645,12 @@ int ms_run(void)
        LOGW("Enter");
 
        g_return_val_if_fail(_ms_run() == MM_ERROR_NONE, MUSE_ERR);
-
-       ms_new();
        g_return_val_if_fail(muse_server, MUSE_ERR);
 
        muse_server->main_loop = g_main_loop_new(NULL, FALSE);
+       g_return_val_if_fail(muse_server->main_loop, MUSE_ERR);
+
+       ms_new();
 
        muse_server->diag_thread = g_thread_try_new("muse_server_diag_thread", _ms_diag_thread, muse_server->main_loop, &error);
        if (!muse_server->diag_thread && error) {