Fix GPS settings dialog so it works.

[mapper] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index 98cbac01a553f4a354749b01c3f965417b4a70b2..65bb75657b2a59e799a88dc18b622ebe10ec0b20 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,5 +1,3 @@
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -8,23 +6,11 @@
 #include <stddef.h>
 #include <locale.h>
 #include <math.h>
-#include <errno.h>
-#include <sys/wait.h>
 #include <glib/gstdio.h>
-#include <gtk/gtk.h>
-#include <fcntl.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <curl/multi.h>
-#include <gconf/gconf-client.h>
-#include <libxml/parser.h>
 
 #include "path.h"
 #include "utils.h"
-#include "gps.h"
-#include "gpsdata.h"
 #include "mapper-types.h"
-#include "bt.h"
 
 void 
 sound_noise(void)
@@ -36,84 +22,3 @@ gdk_beep();
 #endif
 }
 
-void
-deg_format(DegFormat degformat, gdouble coor, gchar * scoor, gchar neg_char, gchar pos_char)
-{
-gdouble min;
-gdouble acoor=fabs(coor);
-
-switch (degformat) {
-       case DDPDDDDD:
-               sprintf(scoor, "%.5f°", coor);
-               break;
-       case DDPDDDDD_NSEW:
-               sprintf(scoor, "%.5f° %c", acoor,
-                       coor < 0.f ? neg_char : pos_char);
-               break;
-
-       case DD_MMPMMM:
-               sprintf(scoor, "%d°%06.3f'",
-                       (int)coor, (acoor - (int)acoor) * 60.0);
-               break;
-       case DD_MMPMMM_NSEW:
-               sprintf(scoor, "%d°%06.3f' %c",
-                       (int)acoor, (acoor - (int)acoor) * 60.0,
-                       coor < 0.f ? neg_char : pos_char);
-               break;
-
-       case DD_MM_SSPS:
-               min = (acoor - (int)acoor) * 60.0;
-               sprintf(scoor, "%d°%02d'%04.1f\"", (int)coor, (int)min,
-                       ((min - (int)min) * 60.0));
-               break;
-       case DD_MM_SSPS_NSEW:
-               min = (acoor - (int)acoor) * 60.0;
-               sprintf(scoor, "%d°%02d'%04.1f\" %c", (int)acoor, (int)min,
-                       ((min - (int)min) * 60.0),
-                       coor < 0.f ? neg_char : pos_char);
-               break;
-       default:;
-}
-}
-
-/**
- * Convert the float lat/lon/speed/heading data into integer units.
- */
-void 
-integerize_data(GpsData *gps, Point *pos)
-{
-gdouble tmp;
-
-latlon2unit(gps->lat, gps->lon, pos->unitx, pos->unity);
-
-tmp=(gps->heading*(1.f/180.f))*G_PI;
-gps->vel_offsetx=(gint)(floorf(gps->speed*sinf(tmp)+0.5f));
-gps->vel_offsety=-(gint)(floorf(gps->speed*cosf(tmp)+0.5f));
-}
-
-gint
-download_comparefunc(const ProgressUpdateInfo * a, const ProgressUpdateInfo * b, gpointer user_data)
-{
-gint diff = (a->priority - b->priority);
-if (diff)
-       return diff;
-diff = (a->tilex - b->tilex);
-if (diff)
-       return diff;
-diff = (a->tiley - b->tiley);
-if (diff)
-       return diff;
-diff = (a->zoom - b->zoom);
-if (diff)
-       return diff;
-diff = (a->repo - b->repo);
-if (diff)
-       return diff;
-/* Otherwise, deletes are "greatest" (least priority). */
-if (!a->retries)
-       return (b->retries ? -1 : 0);
-else if (!b->retries)
-       return (a->retries ? 1 : 0);
-/* Do updates after non-updates (because they'll both be done anyway). */
-return (a->retries - b->retries);
-}