Add ScopedGMainLoop for gmainloop

Change-Id: Ie45393f7d1c7c3c99fff3835f12df14be90cbfa2
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>

diff --git a/server/main.cpp b/server/main.cpp
index 448df58f939cfb03fe18566301258a1daea1ad5d..8c152753e761d17235b542b32ef1858d4d61bc95 100644 (file)
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -25,6 +25,8 @@
 #include <iostream>
 #include <stdexcept>
 
+#include <klay/gmainloop.h>
+
 #include "server.h"
 
 void signalHandler(int signum)
@@ -39,6 +41,7 @@ int main(int argc, char *argv[])
        ::umask(0);
 
        try {
+               ScopedGMainLoop gmainloop;
                Server server;
                server.run();
        } catch (std::exception &e) {

diff --git a/server/server.cpp b/server/server.cpp
index db3af1a4d9990df77de2c80fa74061eb64a5f485..54ee4751e291a49ed4892f2ea91e5ad1ce110e84 100644 (file)
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -58,7 +58,7 @@ Server::~Server()
 void Server::run()
 {
        // Prepare execution environment
-       service->start(true);
+       service->start();
 }
 
 void Server::terminate()