summaryrefslogtreecommitdiffstats
path: root/input/main.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
commit8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch)
tree0d20c6f621673dbdb6095fb4854077152c1d9b40 /input/main.c
parent884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff)
Make it possible to support an embedded GLib
Diffstat (limited to 'input/main.c')
-rw-r--r--input/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/input/main.c b/input/main.c
index df1eee9e..e74c4482 100644
--- a/input/main.c
+++ b/input/main.c
@@ -35,9 +35,10 @@
#include <dbus/dbus.h>
+#include <glib.h>
+
#include "dbus.h"
#include "logging.h"
-#include "glib-ectomy.h"
#include "input-service.h"
@@ -45,7 +46,7 @@ static GMainLoop *main_loop;
static void sig_term(int sig)
{
- g_main_quit(main_loop);
+ g_main_loop_quit(main_loop);
}
int main(int argc, char *argv[])
@@ -67,14 +68,14 @@ int main(int argc, char *argv[])
enable_debug();
/* Create event loop */
- main_loop = g_main_new(FALSE);
+ main_loop = g_main_loop_new(NULL, FALSE);
if (input_dbus_init() < 0) {
error("Unable to get on D-Bus");
exit(1);
}
- g_main_run(main_loop);
+ g_main_loop_run(main_loop);
input_dbus_exit();