Move some variables around

[mapper] / src / gps-browse.c

diff --git a/src/gps-browse.c b/src/gps-browse.c
index 73e5486902b0a6646e434792c1b281a7a042077d..bdbf0f48d43498fea849c76c72f97c9cd477a815 100644 (file)
--- a/src/gps-browse.c
+++ b/src/gps-browse.c
@@ -1,4 +1,27 @@
-#define _GNU_SOURCE
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <config.h>
 #include <unistd.h>
@@ -18,9 +41,14 @@
 
 #include <sqlite3.h>
 
+#ifdef WITH_HILDON_DBUS_BT
+#include <bt-dbus.h>
+#endif
+
 #include "utils.h"
 #include "mapper-types.h"
-#include "bt.h"
+#include "dialogs.h"
+#include "bluetooth-scan.h"
 
 /**
  * Scan for all bluetooth devices.  This method can take a few seconds,
@@ -102,10 +130,9 @@ gboolean scan_bluetooth(GtkWidget * widget, ScanInfo * scan_info)
 
        gtk_widget_destroy(dialog);
 
-#ifdef BT_HILDON_DBUS
+#ifdef WITH_HILDON_DBUS_BT
        /* Clean up D-Bus. */
-       dbus_g_proxy_call(scan_info->req_proxy, BTSEARCH_STOP_SEARCH_REQ,
-                         &error, G_TYPE_INVALID, G_TYPE_INVALID);
+       dbus_g_proxy_call(scan_info->req_proxy, BTSEARCH_STOP_SEARCH_REQ, &error, G_TYPE_INVALID, G_TYPE_INVALID);
        g_object_unref(scan_info->req_proxy);
        g_object_unref(scan_info->sig_proxy);
 #endif