Remove dependencies to gob2

[andy/viking.git] / src / datasource_gps.c

diff --git a/src/datasource_gps.c b/src/datasource_gps.c
index 50f466727278a5a475d305f050134c8f22558410..6c341b1ef2724974fc2ded48833ce3e8b1661cc7 100644 (file)
--- a/src/datasource_gps.c
+++ b/src/datasource_gps.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <string.h>
 
 #include <glib/gprintf.h>
@@ -142,7 +145,12 @@ static void set_total_count(gint cnt, acq_dialog_widgets_t *w)
   gdk_threads_enter();
   if (w->ok) {
     gps_user_data_t *gps_data = (gps_user_data_t *)w->user_data;
-    s = g_strdup_printf(_("Downloading %d %s..."), cnt, (gps_data->progress_label == gps_data->wp_label) ? _("waypoints") : _("trackpoints"));
+    const gchar *tmp_str;
+    if (gps_data->progress_label == gps_data->wp_label)
+      tmp_str = ngettext("Downloading %d waypoint...", "Downloading %d waypoints...", cnt);
+    else
+      tmp_str = ngettext("Downloading %d trackpoint...", "Downloading %d trackpoints...", cnt);
+    s = g_strdup_printf(tmp_str, cnt);
     gtk_label_set_text ( GTK_LABEL(gps_data->progress_label), s );
     gtk_widget_show ( gps_data->progress_label );
     gps_data->total_count = cnt;
@@ -260,10 +268,14 @@ void datasource_gps_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpo
 
   w->ser_l = gtk_label_new (_("Serial Port:"));
   w->ser_b = GTK_COMBO_BOX(gtk_combo_box_entry_new_text ());
+#ifdef WINDOWS
+  gtk_combo_box_append_text (w->ser_b, "com1");
+#else
   gtk_combo_box_append_text (w->ser_b, "/dev/ttyS0");
   gtk_combo_box_append_text (w->ser_b, "/dev/ttyS1");
   gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB0");
   gtk_combo_box_append_text (w->ser_b, "/dev/ttyUSB1");
+#endif
   gtk_combo_box_append_text (w->ser_b, "usb:");
   gtk_combo_box_set_active (w->ser_b, 0);
   g_object_ref(w->ser_b);