Use common dbus system connection

diff --git a/src/bt-maemo.c b/src/bt-maemo.c
index ce76efdeb94d59677323827666e63efccaaf97f8..cabaafa84178e74c16b5d609b92e0ae49e6be852 100644 (file)
--- a/src/bt-maemo.c
+++ b/src/bt-maemo.c
@@ -9,12 +9,15 @@
 /* Let this header handle all ifdefs */
 #include "hildon-mapper.h"
 
+#include "mapper.h"
 #include "bt-maemo-marshal.h"
 #include "bt.h"
 #include "gps.h"
 #include "settings.h"
 #include "ui-common.h"
 
+#include "gps-conn.h"
+
 static guint errors;
 static gint fd;
 

diff --git a/src/mapper.c b/src/mapper.c
index ccb8061a79afb6381ab1e50dbc1e7b92b67269e9..d830df8e4b80700bf069cc3174899d77c4cc64e9 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -54,8 +54,8 @@
 #include <bt-dbus.h>
 #endif
 
+#include "mapper.h"
 #include "hildon-mapper.h"
-
 #include "utils.h"
 #include "mapper-types.h"
 #include "settings.h"
@@ -72,8 +72,6 @@
 #include "gpx.h"
 #include "config-gconf.h"
 
-DBusConnection *dbus_conn;
-
 gfloat UNITS_CONVERT[] = {1.85200,1.15077945,1.f,};
 
 GdkColor COLORABLE_DEFAULT[COLORABLE_ENUM_COUNT] = {

diff --git a/src/mapper.h b/src/mapper.h
new file mode 100644 (file)
index 0000000..c023a85
--- /dev/null
+++ b/src/mapper.h
@@ -0,0 +1,9 @@
+#ifndef _MAPPER_H
+#define _MAPPER_H
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
+DBusConnection *dbus_conn;
+
+#endif