summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-11 23:58:15 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-11 23:58:15 +0000
commitdd6e50453d4e1ae9008d101ba2539df0a47b37b8 (patch)
tree6085391cb3d9a3da2a259bb13d4e83c23c9569ad
parent230f57309dce0d01fd35bdc9dac460f348ec0dab (diff)
Remove D-Bus support
-rw-r--r--sync/Makefile.am4
-rw-r--r--sync/main.c19
2 files changed, 4 insertions, 19 deletions
diff --git a/sync/Makefile.am b/sync/Makefile.am
index 196d0527..8f62c8be 100644
--- a/sync/Makefile.am
+++ b/sync/Makefile.am
@@ -4,9 +4,9 @@ noinst_PROGRAMS = bt.syncd
bt_syncd_SOURCES = main.c
-bt_syncd_LDADD = @GLIB_LIBS@ @OPENSYNC_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
+bt_syncd_LDADD = @OPENSYNC_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENSYNC_CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENSYNC_CFLAGS@
INCLUDES = -I$(top_srcdir)/common
endif
diff --git a/sync/main.c b/sync/main.c
index 1a04bd21..37827375 100644
--- a/sync/main.c
+++ b/sync/main.c
@@ -30,31 +30,18 @@
#include <unistd.h>
#include <stdlib.h>
+#include <glib.h>
+
#include <opensync/opensync.h>
#include <osengine/engine.h>
-#include <dbus/dbus-glib.h>
-
-static DBusGConnection *conn;
-
int main(int argc, char *argv[])
{
GMainLoop *mainloop;
- GError *error = NULL;
OSyncEnv *env;
- g_type_init();
-
mainloop = g_main_loop_new(NULL, FALSE);
- conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
- if (error != NULL) {
- g_printerr("Connecting to system bus failed: %s\n",
- error->message);
- g_error_free(error);
- exit(EXIT_FAILURE);
- }
-
env = osync_env_new();
osync_env_initialize(env, NULL);
@@ -65,7 +52,5 @@ int main(int argc, char *argv[])
osync_env_free(env);
- dbus_g_connection_unref(conn);
-
return 0;
}