summaryrefslogtreecommitdiffstats
path: root/hcid/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 /hcid/main.c
parent884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff)
Make it possible to support an embedded GLib
Diffstat (limited to 'hcid/main.c')
-rw-r--r--hcid/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hcid/main.c b/hcid/main.c
index 30b1c674..b6b1f671 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -42,7 +42,8 @@
#include <bluetooth/hci.h>
#include <bluetooth/hci_lib.h>
-#include "glib-ectomy.h"
+#include <glib.h>
+
#include "notify.h"
#include "hcid.h"
@@ -599,7 +600,7 @@ static gboolean io_stack_event(GIOChannel *chan, GIOCondition cond, gpointer dat
error("Read from control socket failed: %s (%d)",
strerror(errno), errno);
- g_main_quit(event_loop);
+ g_main_loop_quit(event_loop);
return FALSE;
}
@@ -766,7 +767,7 @@ int main(int argc, char *argv[])
init_services(CONFIGDIR);
/* Start event processor */
- g_main_run(event_loop);
+ g_main_loop_run(event_loop);
if (sdp)
stop_sdp_server();