5 files changed, 13 insertions, 51 deletions
diff --git a/serial/Makefile.am b/serial/Makefile.am
index 01551889..7a0b34c2 100644
--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -19,6 +19,6 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
 
-EXTRA_DIST = serial-api.txt test-serial
+EXTRA_DIST = serial-api.txt
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/serial/main.c b/serial/main.c
index 97b26925..39df1650 100644
--- a/serial/main.c
+++ b/serial/main.c
@@ -26,24 +26,24 @@
 #endif
 
 #include <errno.h>
-#include <sys/types.h>
 
 #include <gdbus.h>
 
 #include "plugin.h"
-#include "logging.h"
 #include "manager.h"
 
+static DBusConnection *connection;
+
 static int serial_init(void)
 {
-	DBusConnection *conn;
-
-	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-	if (conn == NULL)
+	connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+	if (connection == NULL)
 		return -EIO;
 
-	if (serial_manager_init(conn) < 0)
+	if (serial_manager_init(connection) < 0) {
+		dbus_connection_unref(connection);
 		return -EIO;
+	}
 
 	return 0;
 }
@@ -51,6 +51,8 @@ static int serial_init(void)
 static void serial_exit(void)
 {
 	serial_manager_exit();
+
+	dbus_connection_unref(connection);
 }
 
 BLUETOOTH_PLUGIN_DEFINE("serial", serial_init, serial_exit)
diff --git a/serial/port.c b/serial/port.c
index 0c70dc07..4abd954e 100644
--- a/serial/port.c
+++ b/serial/port.c
@@ -53,7 +53,7 @@
 #include "manager.h"
 #include "storage.h"
 
-#define SERIAL_PORT_INTERFACE	"org.bluez.serial.Port"
+#define SERIAL_PORT_INTERFACE	"org.bluez.Serial"
 #define ERROR_INVALID_ARGS	"org.bluez.Error.InvalidArguments"
 #define ERROR_DOES_NOT_EXIST	"org.bluez.Error.DoesNotExist"
 
diff --git a/serial/proxy.c b/serial/proxy.c
index d779d848..7128bdbc 100644
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -67,8 +67,8 @@
 #define DIALUP_NET_NAME		"dun"
 #define DIALUP_NET_UUID		"00001103-0000-1000-8000-00805F9B34FB"
 
-#define SERIAL_PROXY_INTERFACE	"org.bluez.serial.Proxy"
-#define SERIAL_MANAGER_INTERFACE "org.bluez.serial.ProxyManager"
+#define SERIAL_PROXY_INTERFACE	"org.bluez.SerialProxy"
+#define SERIAL_MANAGER_INTERFACE "org.bluez.SerialProxyManager"
 #define BUF_SIZE		1024
 
 typedef enum {
diff --git a/serial/test-serial b/serial/test-serial
deleted file mode 100755
index aec728d4..00000000
--- a/serial/test-serial
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import time
-import dbus
-
-bus = dbus.SystemBus()
-
-manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'),
-							'org.bluez.Manager')
-
-conn = manager.ActivateService('serial')
-
-serial = dbus.Interface(bus.get_object(conn, '/org/bluez/serial'),
-						'org.bluez.serial.Manager')
-
-if (len(sys.argv) < 2):
-	print "Usage: %s <address> [service]" % (sys.argv[0])
-	sys.exit(1)
-
-address = sys.argv[1]
-
-if (len(sys.argv) < 3):
-	service = "spp"
-else:
-	service = sys.argv[2]
-
-device = serial.ConnectService(address, service)
-
-print "Connected %s to %s" % (device, address)
-
-print "Press CTRL-C to disconnect"
-
-try:
-	time.sleep(1000)
-	print "Terminating connection"
-except:
-	pass
-
-serial.DisconnectService(device)