- Update to 0.99.4.

Submitted by:	Craig Whipp <crwhipp@gmail.com>

14 files changed, 409 insertions, 17 deletions

diff --git a/astro/tangogps/Makefile b/astro/tangogps/Makefile
index 7e0895e04858..d98946df2f67 100644
--- a/astro/tangogps/Makefile
+++ b/astro/tangogps/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	tangogps
-PORTVERSION=	0.99.3
-PORTREVISION=	2
+PORTVERSION=	0.99.4
+PORTREVISION=	0
 CATEGORIES=	astro geography
 MASTER_SITES=	http://www.tangogps.org/downloads/
 
@@ -15,9 +15,15 @@ MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A comprehencive GPS mapping application
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		exif.12:${PORTSDIR}/graphics/libexif
+		exif.12:${PORTSDIR}/graphics/libexif \
+		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
+USE_AUTOTOOLS=	automake aclocal libtool autoconf
+ACLOCAL_ARGS=	--force
+AUTCONF_ARGS=	--force
+AUTOMAKE_ARGS=	--force
 GNU_CONFIGURE=	yes
+
 USE_GNOME=	gtk20 gconf2 libxml2
 USE_SQLITE=	3
 INSTALLS_ICONS=	yes
diff --git a/astro/tangogps/distinfo b/astro/tangogps/distinfo
index eb0d6c9a8066..5ed3a81d5e3b 100644
--- a/astro/tangogps/distinfo
+++ b/astro/tangogps/distinfo
@@ -1,3 +1,2 @@
-MD5 (tangogps-0.99.3.tar.gz) = 74b4f584b6edae576c1d77d166a9476e
-SHA256 (tangogps-0.99.3.tar.gz) = ff8bf63021e54ea7cd5c52382b32877252e5230154606f6235648caf36f51b8f
-SIZE (tangogps-0.99.3.tar.gz) = 493873
+SHA256 (tangogps-0.99.4.tar.gz) = 660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a
+SIZE (tangogps-0.99.4.tar.gz) = 518475
diff --git a/astro/tangogps/files/patch-Makefile.am b/astro/tangogps/files/patch-Makefile.am
new file mode 100644
index 000000000000..f96be7876f57
--- /dev/null
+++ b/astro/tangogps/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am	Sat Jul 10 06:54:31 2010 -0700
++++ Makefile.am	Fri Jul 23 21:28:20 2010 -0700
+@@ -5,7 +5,7 @@
+ 
+ SUBDIRS = po src pixmaps data
+ 
+-tangogpsdocdir = ${prefix}/doc/tangogps
++tangogpsdocdir = ${prefix}/share/doc/tangogps
+ tangogpsdoc_DATA = \
+ 	README\
+ 	COPYING\
diff --git a/astro/tangogps/files/patch-Makefile.in b/astro/tangogps/files/patch-Makefile.in
deleted file mode 100644
index 07bab95bb692..000000000000
--- a/astro/tangogps/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-03-04 23:32:30.000000000 +0300
-+++ Makefile.in	2009-03-04 23:33:22.000000000 +0300
-@@ -221,7 +221,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = po src pixmaps data
--tangogpsdocdir = ${prefix}/doc/tangogps
-+tangogpsdocdir = ${prefix}/share/doc/tangogps
- tangogpsdoc_DATA = \
- 	README\
- 	COPYING\
diff --git a/astro/tangogps/files/patch-configure.in b/astro/tangogps/files/patch-configure.in
new file mode 100644
index 000000000000..15d66787348e
--- /dev/null
+++ b/astro/tangogps/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in	Sat Jul 10 06:54:31 2010 -0700
++++ configure.in	Fri Jul 23 05:48:57 2010 -0700
+@@ -23,7 +23,7 @@
+ 
+ AM_PROG_LIBTOOL
+ 
+-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 libxml-2.0 libsoup-2.4 bluez])
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 libxml-2.0 libsoup-2.4])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
diff --git a/astro/tangogps/files/patch-src-Makefile.am b/astro/tangogps/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..6f88196812e6
--- /dev/null
+++ b/astro/tangogps/files/patch-src-Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am	Sat Jul 10 06:54:31 2010 -0700
++++ src/Makefile.am	Fri Jul 23 06:16:56 2010 -0700
+@@ -52,8 +52,6 @@
+ 	exif.h\
+ 	livetracks.c\
+ 	livetracks.h\
+-	hrm_functions.c\
+-	hrm_functions.h\
+ 	dataupload.c\
+ 	dataupload.h
+ 
diff --git a/astro/tangogps/files/patch-src-callbacks.c b/astro/tangogps/files/patch-src-callbacks.c
new file mode 100644
index 000000000000..d001d8006a5d
--- /dev/null
+++ b/astro/tangogps/files/patch-src-callbacks.c
@@ -0,0 +1,65 @@
+--- src/callbacks.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/callbacks.c	Fri Jul 23 06:16:57 2010 -0700
+@@ -28,7 +28,6 @@
+ #include "poi.h"
+ #include "wp.h"
+ #include "tracks.h"
+-#include "hrm_functions.h"
+ #include "dataupload.h"
+ 
+ #define WTFCOUNTER 5
+@@ -405,7 +404,6 @@
+ 		event->area.width, event->area.height);
+ 	
+ 	osd_speed(TRUE);
+-	osd_hrm(TRUE);
+ 	map_scale_indicator();
+ 	
+ 	return FALSE;
+@@ -3971,43 +3969,6 @@
+ 	gconf_client_set_string(global_gconfclient, GCONF"/me_msg", me_msg, NULL);
+ }
+ 
+-void
+-on_checkbutton18_toggled               (GtkToggleButton *togglebutton,
+-                                        gpointer         user_data)
+-{
+-	GtkWidget *widget;
+-	
+-	hrm_on = gtk_toggle_button_get_active(togglebutton);
+-	
+-	gconf_client_set_bool(	global_gconfclient, 
+-				GCONF"/hrm_on",
+-				hrm_on, NULL);
+-
+-	global_reconnect_hrm = TRUE;
+-	
+-	widget = lookup_widget(window1, "label205");
+-	(hrm_on) ? gtk_widget_show(widget) : gtk_widget_hide(widget);
+-
+-	widget = lookup_widget(window1, "label206");
+-	(hrm_on) ? gtk_widget_show(widget) : gtk_widget_hide(widget);
+-
+-	widget = lookup_widget(window1, "label207");
+-	(hrm_on) ? gtk_widget_show(widget) : gtk_widget_hide(widget);
+-}
+-
+-
+-void
+-on_entry33_changed                     (GtkEditable     *editable,
+-                                        gpointer         user_data)
+-{
+-	const char *entry;
+-	
+-	entry = gtk_entry_get_text(GTK_ENTRY(editable));
+-	
+-	gconf_client_set_string(global_gconfclient, 
+-				GCONF"/hrm_bt_addr",
+-				entry, NULL);
+-	
+-	global_hrm_bt_addr = g_strdup(entry);
+-	global_reconnect_hrm = TRUE;
+-}
++
++
++
diff --git a/astro/tangogps/files/patch-src-globals.c b/astro/tangogps/files/patch-src-globals.c
new file mode 100644
index 000000000000..8610ec3d9478
--- /dev/null
+++ b/astro/tangogps/files/patch-src-globals.c
@@ -0,0 +1,34 @@
+--- src/globals.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/globals.c	Fri Jul 23 06:17:00 2010 -0700
+@@ -37,7 +37,6 @@
+ 
+ 
+ gps_data_t *gpsdata = NULL;
+-hrm_data_t *hrmdata = NULL;
+ 
+ GQueue		*trackpoint_list= NULL;
+ GSList		*friends_list	= NULL;
+@@ -53,7 +52,6 @@
+ gboolean	trip_counter_on	= TRUE;
+ gboolean	trip_logger_on	= FALSE;
+ gboolean	trip_livelog_on	= FALSE;
+-gboolean	hrm_on		= FALSE;
+ 
+ trackpoint_t	global_myposition;
+ 
+@@ -72,7 +70,6 @@
+ gboolean	global_mapmode = TRUE;
+ gboolean	global_autocenter = TRUE;
+ gboolean	global_reconnect_gpsd = TRUE;
+-gboolean	global_reconnect_hrm = TRUE;
+ int		global_tiles_in_dl_queue = 0;
+ 
+ gboolean	global_show_friends = FALSE;
+@@ -95,7 +92,6 @@
+ gchar		*global_server	= NULL;
+ gchar		*global_port	= NULL;
+ 
+-gchar		*global_hrm_bt_addr = NULL;
+ 
+ gchar		*global_home_dir = NULL;
+ gchar		*tangogps_dir = NULL;
diff --git a/astro/tangogps/files/patch-src-globals.h b/astro/tangogps/files/patch-src-globals.h
new file mode 100644
index 000000000000..1a6c31db10a7
--- /dev/null
+++ b/astro/tangogps/files/patch-src-globals.h
@@ -0,0 +1,46 @@
+--- src/globals.h	Sat Jul 10 06:54:31 2010 -0700
++++ src/globals.h	Fri Jul 23 06:17:01 2010 -0700
+@@ -91,11 +91,6 @@
+ 	gboolean seen_vaild; /* ever had a vaild fix? */
+ } gps_data_t;
+ 
+-typedef struct {
+-	int freq;
+-	int min;
+-	int max;
+-} hrm_data_t;
+ 
+ extern GdkPixmap 	*pixmap;
+ extern GtkWidget	*window1, *window2;
+@@ -126,7 +121,6 @@
+ 
+ 
+ extern gps_data_t *gpsdata;
+-extern hrm_data_t *hrmdata;
+ 
+ extern GQueue		*trackpoint_list;
+ extern GSList		*friends_list;
+@@ -141,7 +135,6 @@
+ extern trackpoint_t	global_myposition;
+ extern gboolean		trip_logger_on;
+ extern gboolean		trip_livelog_on;
+-extern gboolean		hrm_on;
+ 
+ extern gchar		*global_curr_reponame;
+ extern int		global_repo_cnt;
+@@ -156,7 +149,6 @@
+ extern gboolean		global_mapmode;
+ extern gboolean		global_autocenter;
+ extern gboolean		global_reconnect_gpsd;
+-extern gboolean		global_reconnect_hrm;
+ extern int		global_tiles_in_dl_queue;
+ 
+ extern gboolean		global_show_pois;
+@@ -179,7 +171,6 @@
+ extern gchar		*global_server;
+ extern gchar		*global_port;
+ 
+-extern gchar		*global_hrm_bt_addr;
+ 
+ extern gchar		*global_home_dir;
+ extern gchar		*tangogps_dir;
diff --git a/astro/tangogps/files/patch-src-gps_functions.c b/astro/tangogps/files/patch-src-gps_functions.c
new file mode 100644
index 000000000000..bfd707fad782
--- /dev/null
+++ b/astro/tangogps/files/patch-src-gps_functions.c
@@ -0,0 +1,24 @@
+--- src/gps_functions.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/gps_functions.c	Fri Jul 23 06:17:01 2010 -0700
+@@ -28,7 +28,6 @@
+ #include "wp.h"
+ #include "tracks.h"
+ #include "livetracks.h"
+-#include "hrm_functions.h"
+ 
+ #define BUFSIZE 512
+ char * distance2scale(float distance, float *factor);
+@@ -363,13 +362,6 @@
+ 		set_label_nogps();
+ 	}
+ 	
+-	if(hrm_on && (!hrmdata  || global_reconnect_hrm))
+-		get_hrm_data();
+-	else if(hrm_on && hrmdata) {
+-		osd_hrm(FALSE);
+-		if(global_infopane_visible)
+-			set_hrm_labels();
+-	}
+ 	
+ 	return TRUE; 
+ }
diff --git a/astro/tangogps/files/patch-src-init.c b/astro/tangogps/files/patch-src-init.c
new file mode 100644
index 000000000000..85e023cf19cd
--- /dev/null
+++ b/astro/tangogps/files/patch-src-init.c
@@ -0,0 +1,39 @@
+--- src/init.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/init.c	Fri Jul 23 22:13:21 2010 -0700
+@@ -97,7 +97,7 @@
+ 	gpointer data = NULL;	
+ 	
+ 	GError	*err = NULL;
+-	const gchar *nick, *pass, *me_msg, *hrm_bt_addr;
++	const gchar *nick, *pass, *me_msg;
+ 	GtkWidget *widget;
+ 	gchar buffer[128];
+ 	gboolean gconf_fftimer_running;
+@@ -116,7 +116,6 @@
+ 	nick			= gconf_client_get_string(global_gconfclient, GCONF"/nick",&err);
+ 	pass			= gconf_client_get_string(global_gconfclient, GCONF"/pass",&err);
+ 	me_msg			= gconf_client_get_string(global_gconfclient, GCONF"/me_msg",&err);
+-	hrm_bt_addr		= gconf_client_get_string(global_gconfclient, GCONF"/hrm_bt_addr",&err);
+ 	
+ 	global_speed_unit	= gconf_client_get_int(global_gconfclient, GCONF"/speed_unit",&err);
+ 	global_alt_unit		= gconf_client_get_int(global_gconfclient, GCONF"/alt_unit",&err);
+@@ -163,9 +162,6 @@
+ 	widget  = lookup_widget(window1, "entry29");
+ 	if(me_msg)
+ 		gtk_entry_set_text( GTK_ENTRY(widget), me_msg );
+-	widget  = lookup_widget(window1, "entry33");
+-	if(hrm_bt_addr)
+-		gtk_entry_set_text( GTK_ENTRY(widget), hrm_bt_addr );
+ 
+ 	
+ 	widget = lookup_widget(window1, "vscale1");
+@@ -182,9 +178,6 @@
+ 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), global_auto_download);
+ 
+ 	
+-	hrm_on = gconf_client_get_bool(global_gconfclient, GCONF"/hrm_on",&err);
+-	widget = lookup_widget(window1, "checkbutton18");
+-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), hrm_on);
+ 	
+ 	
+ 	
diff --git a/astro/tangogps/files/patch-src-interface.c b/astro/tangogps/files/patch-src-interface.c
new file mode 100644
index 000000000000..a092089f0f39
--- /dev/null
+++ b/astro/tangogps/files/patch-src-interface.c
@@ -0,0 +1,104 @@
+--- src/interface.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/interface.c	Fri Jul 23 22:14:03 2010 -0700
+@@ -258,11 +258,11 @@
+   GtkWidget *frame15;
+   GtkWidget *alignment21;
+   GtkWidget *vbox54;
+-  GtkWidget *checkbutton18;
+-  GtkWidget *hbox56;
+-  GtkWidget *label209;
+-  GtkWidget *entry33;
+-  GtkWidget *label208;
++  //GtkWidget *checkbutton18;
++  //GtkWidget *hbox56;
++  //GtkWidget *label209;
++  //GtkWidget *entry33;
++  //GtkWidget *label208;
+   GtkWidget *frame12;
+   GtkWidget *alignment12;
+   GtkWidget *vbox22;
+@@ -1528,30 +1528,30 @@
+   gtk_widget_show (vbox54);
+   gtk_container_add (GTK_CONTAINER (alignment21), vbox54);
+ 
+-  checkbutton18 = gtk_check_button_new_with_mnemonic (_("Activate Heartrate Monitor"));
+-  gtk_widget_show (checkbutton18);
+-  gtk_box_pack_start (GTK_BOX (vbox54), checkbutton18, FALSE, FALSE, 0);
+-  gtk_widget_set_size_request (checkbutton18, -1, 45);
+-
+-  hbox56 = gtk_hbox_new (FALSE, 0);
+-  gtk_widget_show (hbox56);
+-  gtk_box_pack_start (GTK_BOX (vbox54), hbox56, TRUE, TRUE, 0);
+-
+-  label209 = gtk_label_new (_("Bluetooth Address: "));
+-  gtk_widget_show (label209);
+-  gtk_box_pack_start (GTK_BOX (hbox56), label209, FALSE, FALSE, 0);
+-  gtk_misc_set_alignment (GTK_MISC (label209), 0, 0.5);
+-
+-  entry33 = gtk_entry_new ();
+-  gtk_widget_show (entry33);
+-  gtk_box_pack_start (GTK_BOX (hbox56), entry33, FALSE, TRUE, 0);
+-  gtk_entry_set_invisible_char (GTK_ENTRY (entry33), 9679);
+-  gtk_entry_set_width_chars (GTK_ENTRY (entry33), 18);
+-
+-  label208 = gtk_label_new (_("<b>Heart Rate Monitor</b>"));
+-  gtk_widget_show (label208);
+-  gtk_frame_set_label_widget (GTK_FRAME (frame15), label208);
+-  gtk_label_set_use_markup (GTK_LABEL (label208), TRUE);
++  //checkbutton18 = gtk_check_button_new_with_mnemonic (_("Activate Heartrate Monitor"));
++  //gtk_widget_show (checkbutton18);
++  //gtk_box_pack_start (GTK_BOX (vbox54), checkbutton18, FALSE, FALSE, 0);
++  //gtk_widget_set_size_request (checkbutton18, -1, 45);
++
++  //hbox56 = gtk_hbox_new (FALSE, 0);
++  //gtk_widget_show (hbox56);
++  //gtk_box_pack_start (GTK_BOX (vbox54), hbox56, TRUE, TRUE, 0);
++
++  //label209 = gtk_label_new (_("Bluetooth Address: "));
++  //gtk_widget_show (label209);
++  //gtk_box_pack_start (GTK_BOX (hbox56), label209, FALSE, FALSE, 0);
++  //gtk_misc_set_alignment (GTK_MISC (label209), 0, 0.5);
++
++  //entry33 = gtk_entry_new ();
++  //gtk_widget_show (entry33);
++  //gtk_box_pack_start (GTK_BOX (hbox56), entry33, FALSE, TRUE, 0);
++  //gtk_entry_set_invisible_char (GTK_ENTRY (entry33), 9679);
++  //gtk_entry_set_width_chars (GTK_ENTRY (entry33), 18);
++
++  //label208 = gtk_label_new (_("<b>Heart Rate Monitor</b>"));
++  //gtk_widget_show (label208);
++  //gtk_frame_set_label_widget (GTK_FRAME (frame15), label208);
++  //gtk_label_set_use_markup (GTK_LABEL (label208), TRUE);
+ 
+   frame12 = gtk_frame_new (NULL);
+   gtk_widget_show (frame12);
+@@ -1828,12 +1828,6 @@
+   g_signal_connect ((gpointer) radiobutton21, "toggled",
+                     G_CALLBACK (on_radiobutton21_toggled),
+                     NULL);
+-  g_signal_connect ((gpointer) checkbutton18, "toggled",
+-                    G_CALLBACK (on_checkbutton18_toggled),
+-                    NULL);
+-  g_signal_connect ((gpointer) entry33, "changed",
+-                    G_CALLBACK (on_entry33_changed),
+-                    NULL);
+   g_signal_connect ((gpointer) entry3, "changed",
+                     G_CALLBACK (on_entry3_changed),
+                     NULL);
+@@ -2074,11 +2068,11 @@
+   GLADE_HOOKUP_OBJECT (window1, frame15, "frame15");
+   GLADE_HOOKUP_OBJECT (window1, alignment21, "alignment21");
+   GLADE_HOOKUP_OBJECT (window1, vbox54, "vbox54");
+-  GLADE_HOOKUP_OBJECT (window1, checkbutton18, "checkbutton18");
+-  GLADE_HOOKUP_OBJECT (window1, hbox56, "hbox56");
+-  GLADE_HOOKUP_OBJECT (window1, label209, "label209");
+-  GLADE_HOOKUP_OBJECT (window1, entry33, "entry33");
+-  GLADE_HOOKUP_OBJECT (window1, label208, "label208");
++  //GLADE_HOOKUP_OBJECT (window1, checkbutton18, "checkbutton18");
++  //GLADE_HOOKUP_OBJECT (window1, hbox56, "hbox56");
++  //GLADE_HOOKUP_OBJECT (window1, label209, "label209");
++  //GLADE_HOOKUP_OBJECT (window1, entry33, "entry33");
++  //GLADE_HOOKUP_OBJECT (window1, label208, "label208");
+   GLADE_HOOKUP_OBJECT (window1, frame12, "frame12");
+   GLADE_HOOKUP_OBJECT (window1, alignment12, "alignment12");
+   GLADE_HOOKUP_OBJECT (window1, vbox22, "vbox22");
diff --git a/astro/tangogps/files/patch-src-livetracks.c b/astro/tangogps/files/patch-src-livetracks.c
new file mode 100644
index 000000000000..38cf0f319738
--- /dev/null
+++ b/astro/tangogps/files/patch-src-livetracks.c
@@ -0,0 +1,14 @@
+--- src/livetracks.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/livetracks.c	Fri Jul 23 06:17:04 2010 -0700
+@@ -65,9 +65,9 @@
+ 		tp = list->data;
+ 		
+ 		if(tp->time > time_last_update)
+-			g_string_append_printf(string, "::%d:%f:%f:%.1f:%.1f:%.0f:%.0f:%d%%0A",
++			g_string_append_printf(string, "::%d:%f:%f:%.1f:%.1f:%.0f:%.0f:%%0A",
+ 					tp->time, tp->lat_deg, tp->lon_deg,
+-					tp->alt, tp->speed, tp->head, tp->hdop, tp->heart);
++					tp->alt, tp->speed, tp->head, tp->hdop);
+ 	}
+ 
+ 	
diff --git a/astro/tangogps/files/patch-src-tracks.c b/astro/tangogps/files/patch-src-tracks.c
new file mode 100644
index 000000000000..36bb636f9809
--- /dev/null
+++ b/astro/tangogps/files/patch-src-tracks.c
@@ -0,0 +1,39 @@
+--- src/tracks.c	Sat Jul 10 06:54:31 2010 -0700
++++ src/tracks.c	Fri Jul 23 06:17:08 2010 -0700
+@@ -218,7 +218,6 @@
+ 	gchar data[256];
+ 	time_t time_sec;
+ 	struct tm *ts;
+-	int heartfreq = 42;
+ 	
+ 	
+ 	if(gpsdata->valid)
+@@ -228,17 +227,15 @@
+ 		ts = localtime(&time_sec);
+ 		strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", ts);
+ 		
+-		heartfreq = (hrmdata) ? hrmdata->freq : 0;
+ 		
+-		snprintf(data, sizeof(data), "%f,%f,%.1f,%.1f,%.1f,%.1f,%s,%d\n",
++		snprintf(data, sizeof(data), "%f,%f,%.1f,%.1f,%.1f,%.1f,%s\n",
+ 				gpsdata->fix.latitude,
+ 				gpsdata->fix.longitude,
+ 				gpsdata->fix.altitude,
+ 				gpsdata->fix.speed,
+ 				gpsdata->fix.heading,
+ 				gpsdata->hdop,
+-				buffer,
+-				heartfreq);
++				buffer);
+ 		
+ 		if (fp) fprintf(fp, "%s", data);
+ 	}
+@@ -521,8 +518,6 @@
+ 		tp->hdop	 = atof(arr[5]);
+ 		tp->time_iso8106 = g_strchomp(arr[6]);
+ 		
+-		if(arr[7] != NULL)
+-			tp->heart = atoi(arr[7]);
+ 				
+ 		list = g_slist_prepend(list, tp);
+ 	}