Fix GPS settings dialog so it works.

[mapper] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index a0ae6976bc9d7dde8457d2481f172c35c34f8bf8..a1e1467d85575c1a352b62810f07dbefa2a3d880 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,9 +21,7 @@
 #ifndef _MAPPER_UTILS_H
 #define _MAPPER_UTILS_H
 
-#define _GNU_SOURCE
-
-#include <config.h>
+#include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -93,11 +91,6 @@
     } \
 }
 
-#define DISTANCE_SQUARED(a, b) \
-   ((guint64)((((gint64)(b).unitx)-(a).unitx)*(((gint64)(b).unitx)-(a).unitx))\
-  + (guint64)((((gint64)(b).unity)-(a).unity)*(((gint64)(b).unity)-(a).unity)))
-
-
 #ifdef WITH_OSSO
 #define KEEP_DISPLAY_ON() { \
     /* Note that the flag means keep on ONLY when fullscreen. */ \
@@ -139,7 +132,7 @@ if (_http_proxy_host) { \
 
 #ifdef WITH_HILDON
 #define MACRO_BANNER_SHOW_INFO(A, S) { \
-    gchar *my_macro_buffer = g_strdup_printf("<span size='%s'>%s</span>", \
+    gchar *my_macro_buffer = g_markup_printf_escaped("<span size='%s'>%s</span>", \
             INFO_FONT_TEXT[_info_font_size], (S)); \
     hildon_banner_show_information_with_markup(A, NULL, my_macro_buffer); \
     g_free(my_macro_buffer); \