[snappy/aurena: 4/5] quit nicely

[Luis de Bethencourt <luisbg src gnome org>]

commit 936b2f02ebec30e02b506c2f831b832ae717e9d7
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Sun Sep 16 12:07:18 2012 +0100

    quit nicely

 src/simple-client.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/simple-client.c b/src/simple-client.c
index a284946..4015e5a 100644
--- a/src/simple-client.c
+++ b/src/simple-client.c
@@ -31,7 +31,6 @@
 
 #include <src/snra-client.h>
 
-static GMainLoop *ml = NULL;
 static gint sigint_received;
 
 static void sigint_handler_sighandler (int signum);
@@ -62,7 +61,6 @@ sigint_check (G_GNUC_UNUSED void *data)
 {
   if (sigint_received) {
     g_print ("Exiting...\n");
-    g_main_loop_quit (ml);
   }
   return TRUE;
 }
@@ -81,8 +79,7 @@ main (int argc, char *argv[])
   int ret = 1;
   const gchar *server = NULL;
 
-  gst_init (&argc, &argv);
-  clutter_init (&argc, &argv);
+  clutter_gst_init (&argc, &argv);
 
   if (argc > 1) {
     /* Connect directly to the requested server, no avahi */
@@ -98,14 +95,11 @@ main (int argc, char *argv[])
   if (client == NULL)
     goto fail;
 
-  ml = g_main_loop_new (NULL, FALSE);
-  g_main_loop_run (ml);
+  clutter_main ();
 
   ret = 0;
 fail:
   if (client)
     g_object_unref (client);
-  if (ml)
-    g_main_loop_unref (ml);
   return ret;
 }