Improve typing of constants data

[platform/core/messaging/msg-service.git] / framework / main.cpp

diff --git a/framework/main.cpp b/framework/main.cpp
index 87482e0..4383d9b 100755 (executable)
--- a/framework/main.cpp
+++ b/framework/main.cpp
@@ -1,17 +1,20 @@
 /*
-* Copyright 2012  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.tizenopensource.org/license
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+ * msg-service
+ *
+ * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
 */
 
 /*==================================================================================================
@@ -110,7 +113,7 @@ msg_error_t InitMmsDir()
 
                        // if IPC data path is already exist, clear all files in folder.
                        char exeStr[1024];
-                       snprintf(exeStr, 1024, "rm %s*.DATA", MSG_IPC_DATA_PATH);
+                       snprintf(exeStr, 1024, "rm %s/*.DATA", MSG_IPC_DATA_PATH);
                        system(exeStr);
                }
                else
@@ -301,6 +304,8 @@ void* InitMsgServer(void*)
 {
        msg_error_t err = MSG_SUCCESS;
 
+       MsgOpenContactSvc();
+
        try
        {
                // plugin manager initialize
@@ -326,7 +331,8 @@ void* InitMsgServer(void*)
        }
 
        // Set Msg FW Ready Flag
-       MsgSettingSetBool(VCONFKEY_MSG_SERVER_READY, true);
+       if(MsgSettingSetBool(VCONFKEY_MSG_SERVER_READY, true) != MSG_SUCCESS)
+               MSG_DEBUG("MsgSettingSetBool FAIL : VCONFKEY_MSG_SERVER_READY");
        MSG_DEBUG("### VCONFKEY_MSG_SERVER_READY ###");
 
        if (plg == NULL) {
@@ -336,6 +342,9 @@ void* InitMsgServer(void*)
                return (void*)0;
        }
 
+       // Clear and reset notification
+       MsgCleanAndResetNoti();
+
        MSG_SIM_STATUS_T simStatus = MSG_SIM_STATUS_NORMAL;
 
        // Check Sim Status
@@ -379,13 +388,9 @@ void* InitMsgServer(void*)
 
        MsgReleaseMemory();
 
-       // Try to connect contact server  if it is not opened.
-       MsgOpenContactSvc();
-
        // Register Callback to get the change of contact
        MsgInitContactSvc(&MsgContactChangedCallback);
 
-       MsgCleanAndResetNoti();
        MsgSoundInitRepeatAlarm();
 
        return (void*)0;
@@ -431,7 +436,8 @@ signal( SIGCHLD, SIG_IGN );
        MSG_DEBUG("===========START MESSAGING FRAMEWORK==========");
 
        // Reset message server ready flag
-       MsgSettingSetBool(VCONFKEY_MSG_SERVER_READY, false);
+       if(MsgSettingSetBool(VCONFKEY_MSG_SERVER_READY, false) != MSG_SUCCESS)
+               MSG_DEBUG("MsgSettingSetBool FAIL: VCONFKEY_MSG_SERVER_READY");
 
        // Connect to DB
        //      MsgStoConnectDB();
@@ -458,7 +464,9 @@ signal( SIGCHLD, SIG_IGN );
 
        mainloop = g_main_loop_new(NULL, FALSE);
 
-       g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,0)
+       g_type_init ();
+#endif
 
        g_idle_add(InitThreadFunc, NULL);