From: Alex Foobarian <foobarian@gmail.com>
Date: Sat, 28 Oct 2006 17:00:44 +0000 (+0000)
Subject: ticket 1577378: make viking compile with older gtk
X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/f3f1fa6cc87e32407a8a56c29248697d4de77bb8

ticket 1577378: make viking compile with older gtk
---

diff --git a/src/datasource_gps.c b/src/datasource_gps.c
index 65fc9aa2..07c942c3 100644
--- a/src/datasource_gps.c
+++ b/src/datasource_gps.c
@@ -83,6 +83,7 @@ static gpointer datasource_gps_init_func ()
 
 static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelargs, gchar **input_file )
 {
+  GtkTreeIter iter;
   gps_user_data_t *w = (gps_user_data_t *)user_data;
 
   if (gps_acquire_in_progress) {
@@ -91,12 +92,14 @@ static void datasource_gps_get_cmd_string ( gpointer user_data, gchar **babelarg
   
   gps_acquire_in_progress = TRUE;
 
-  if (!strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->proto_b)), "Garmin")) {
+  if (!strcmp(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->proto_b),&iter), "Garmin")) {
     *babelargs = g_strdup_printf("%s", "-D 9 -t -w -i garmin");
   } else {
     *babelargs = g_strdup_printf("%s", "-D 9 -t -w -i magellan");
   }
-  *input_file = g_strdup_printf("%s", gtk_combo_box_get_active_text(GTK_COMBO_BOX(w->ser_b)));
+  
+  /* Old stuff */
+  *input_file = g_strdup_printf("%s", gtk_combo_box_get_active_iter(GTK_COMBO_BOX(w->ser_b),&iter));
 
   fprintf(stderr, "using cmdline '%s' and file '%s'\n", *babelargs, *input_file);
 }