diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
commit | 8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch) | |
tree | 0d20c6f621673dbdb6095fb4854077152c1d9b40 /input | |
parent | 884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff) |
Make it possible to support an embedded GLib
Diffstat (limited to 'input')
-rw-r--r-- | input/Makefile.am | 14 | ||||
-rw-r--r-- | input/input-service.c | 29 | ||||
-rw-r--r-- | input/main.c | 9 |
3 files changed, 23 insertions, 29 deletions
diff --git a/input/Makefile.am b/input/Makefile.am index e9efa972..6565d8c1 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -7,23 +7,15 @@ endif servicedir = $(libdir)/bluetooth -if GLIB -glib_cflags = @GLIB_CFLAGS@ -glib_ldadd = @GLIB_LIBS@ -else -glib_cflags = -glib_ldadd = -endif - noinst_PROGRAMS = bluetoothd-service-input bluetoothd_service_input_SOURCES = \ main.c input-service.h input-service.c -LDADD = $(top_builddir)/common/libhelper.a $(glib_ldadd) \ - @DBUS_LIBS@ @BLUEZ_LIBS@ +LDADD = $(top_builddir)/common/libhelper.a \ + @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(glib_cflags) +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common diff --git a/input/input-service.c b/input/input-service.c index 70d2a3f3..5b9f5204 100644 --- a/input/input-service.c +++ b/input/input-service.c @@ -29,20 +29,21 @@ #include <errno.h> #include <unistd.h> -#include "dbus.h" -#include "logging.h" -#include "input-service.h" -#include "glib-ectomy.h" -#include "textfile.h" - -#include <dbus/dbus.h> - #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> +#include <glib.h> + +#include <dbus/dbus.h> + +#include "dbus.h" +#include "logging.h" +#include "textfile.h" +#include "input-service.h" + #define INPUT_SERVICE "org.bluez.input" #define INPUT_PATH "/org/bluez/input" #define INPUT_MANAGER_INTERFACE "org.bluez.input.Manager" @@ -294,7 +295,7 @@ static const DBusObjectPathVTable device_table = { struct input_manager { char adapter[18]; char *adapter_path; - GList *paths; + GSList *paths; }; void input_manager_free(struct input_manager *mgr) @@ -302,7 +303,7 @@ void input_manager_free(struct input_manager *mgr) if (!mgr) return; if (mgr->paths) - g_list_foreach(mgr->paths, (GFunc) free, NULL); + g_slist_foreach(mgr->paths, (GFunc) free, NULL); if (mgr->adapter_path) free(mgr->adapter_path); free(mgr); @@ -548,7 +549,7 @@ static DBusHandlerResult manager_create_device(DBusConnection *conn, DBusError derr; const char *addr; const char *keyb_path = "/org/bluez/input/keyboard0"; - GList *path; + GSList *path; dbus_error_init(&derr); if (!dbus_message_get_args(msg, &derr, @@ -559,7 +560,7 @@ static DBusHandlerResult manager_create_device(DBusConnection *conn, return DBUS_HANDLER_RESULT_HANDLED; } - path = g_list_find_custom(mgr->paths, addr, + path = g_slist_find_custom(mgr->paths, addr, (GCompareFunc) path_addr_cmp); if (path) return err_already_exists(conn, msg, "Input Already exists"); @@ -595,7 +596,7 @@ static DBusHandlerResult manager_create_device(DBusConnection *conn, return err_failed(conn, msg, "Path registration failed"); } - mgr->paths = g_list_append(mgr->paths, strdup(keyb_path)); + mgr->paths = g_slist_append(mgr->paths, strdup(keyb_path)); dbus_message_append_args(reply, DBUS_TYPE_STRING, &keyb_path, DBUS_TYPE_INVALID); @@ -615,7 +616,7 @@ static DBusHandlerResult manager_list_devices(DBusConnection *conn, struct input_manager *mgr = data; DBusMessageIter iter, iter_array; DBusMessage *reply; - GList *paths; + GSList *paths; reply = dbus_message_new_method_return(msg); if (!reply) 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(); |