From 0624dc5bb3e70094a864f5e633a718099ebb05cb Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 28 May 2010 20:47:47 +0200
Subject: [PATCH] Don't ignore the departure and arrival radius settings

---
 src/adac-mitfahrclub.vala |    8 +++++---
 src/beifahrer-cli.vala    |    2 +-
 src/lift-list-window.vala |    6 +++---
 src/query-window.vala     |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/adac-mitfahrclub.vala b/src/adac-mitfahrclub.vala
index b192408..b359e05 100644
--- a/src/adac-mitfahrclub.vala
+++ b/src/adac-mitfahrclub.vala
@@ -236,7 +236,7 @@ public class AdacMitfahrclub {
 		return result;
 	}
 
-	public async List<Lift>? get_lift_list (string city_from, string city_to, Date date, int tolerance = 0) {
+	public async List<Lift>? get_lift_list (string city_from, int radius_from, string city_to, int radius_to, Date date, int tolerance = 0) {
 		if (city_list == null)
 			get_city_list ();
 
@@ -257,9 +257,11 @@ public class AdacMitfahrclub {
 			city_to
 		);
 
-		url += "?type=b&city_from=%d&radius_from=0&city_to=%d&radius_to=0".printf (
+		url += "?type=b&city_from=%d&radius_from=%d&city_to=%d&radius_to=%d".printf (
 			num_from,
-			num_to
+			radius_from,
+			num_to,
+			radius_to
 		);
 
 		url += "&date=date&day=%d&month=%d&year=%d&tolerance=%d&smoking=&avg_speed=&".printf (
diff --git a/src/beifahrer-cli.vala b/src/beifahrer-cli.vala
index 74ad7c0..31bf3d9 100644
--- a/src/beifahrer-cli.vala
+++ b/src/beifahrer-cli.vala
@@ -23,7 +23,7 @@ async void get_lifts (string city_from, string city_to, Date date) {
 	print ("Lifts from %s to %s on %d.%d.%d\n", city_from, city_to,
 	       date.get_day (), date.get_month (), date.get_year ());
 
-	var lift_list = yield adac.get_lift_list (city_from, city_to, date);
+	var lift_list = yield adac.get_lift_list (city_from, 0, city_to, 0, date);
 	foreach (Lift lift in lift_list) {
 		string datetime = "%02d.%02d.%02d".printf (lift.time.day, lift.time.month, lift.time.year);
 		if (lift.time.hour >= 0)
diff --git a/src/lift-list-window.vala b/src/lift-list-window.vala
index f932a7b..eba0adc 100644
--- a/src/lift-list-window.vala
+++ b/src/lift-list-window.vala
@@ -103,13 +103,13 @@ public class LiftListWindow : StackableWindow {
 		BeifahrerProgram.orientation.changed.connect (this.on_orientation_changed);
 	}
 
-	public async void find_lifts (string city_from, string city_to, Date date, int tolerance = 0) {
+	public async void find_lifts (string city_from, int radius_from, string city_to, int radius_to, Date date, int tolerance = 0) {
+		TreeIter iter;
 		set_title ("%s - %s".printf (city_from, city_to));
 		Hildon.gtk_window_set_progress_indicator (this, 1);
 
-		var lift_list = yield adac.get_lift_list (city_from, city_to, date, tolerance);
+		var lift_list = yield adac.get_lift_list (city_from, radius_from, city_to, radius_to, date, tolerance);
 		foreach (Lift lift in lift_list) {
-			TreeIter iter;
 			string icon_name = null;
 			if (LiftFlags.SMOKER in lift.flags)
 				icon_name = "beifahrer_smoker";
diff --git a/src/query-window.vala b/src/query-window.vala
index 7286df4..d5c9bc9 100644
--- a/src/query-window.vala
+++ b/src/query-window.vala
@@ -218,7 +218,7 @@ public class QueryWindow : StackableWindow {
 
 		var window = new LiftListWindow (adac);
 		window.show ();
-		window.find_lifts.begin (city_from, city_to, date, tolerance);
+		window.find_lifts.begin (city_from, departure_button.get_radius (), city_to, arrival_button.get_radius (), date, tolerance);
 	}
 
 	// Switch departure and arrival
-- 
1.7.9.5