Merge lp:~cyphermox/gnome-system-tools/lp-697974 into lp:~ubuntu-desktop/gnome-system-tools/ubuntu

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-06 10:07:17 +0000
+++ debian/changelog	2011-01-14 04:21:15 +0000
@@ -1,3 +1,11 @@
+gnome-system-tools (2.32.0-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/95_timezone_point_selection.patch: Fix selecting a timezone
+    while running on compiz: compute the point we're at when the map gets
+    clicked. (LP: #697974)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 14 Jan 2011 03:16:03 +0000
+
 gnome-system-tools (2.32.0-0ubuntu3) natty; urgency=low
 
   * Replace "cracklib2-dev" with "libcrack2-dev" in Build-Depends. 

=== added file 'debian/patches/95_timezone_point_selection.patch'
--- debian/patches/95_timezone_point_selection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/95_timezone_point_selection.patch	2011-01-14 04:21:15 +0000
@@ -0,0 +1,14 @@
+Index: gnome-system-tools-2.32.0/src/time/tz-map.c
+===================================================================
+--- gnome-system-tools-2.32.0.orig/src/time/tz-map.c	2010-05-24 17:09:57.000000000 +0000
++++ gnome-system-tools-2.32.0/src/time/tz-map.c	2011-01-14 03:05:26.038764104 +0000
+@@ -416,7 +416,8 @@
+ 		        e_map_point_set_color_rgba (tzmap->map,
+ 						    tzmap->point_selected,
+ 						    TZ_MAP_POINT_NORMAL_RGBA);
+-		tzmap->point_selected = tzmap->point_hover;
++		tzmap->point_selected =
++			e_map_get_closest_point (tzmap->map, longitude, latitude, FALSE);
+ 
+ 		location_combo = gst_dialog_get_widget (tzmap->tool->main_dialog, "location_combo");
+ 		tz_location    = e_tz_map_location_from_point (tzmap, tzmap->point_selected);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-05 18:36:59 +0000
+++ debian/patches/series	2011-01-14 04:21:15 +0000
@@ -9,3 +9,4 @@
 82_gst-packages-time-admin.patch
 91_shares_services_detection.patch
 92_fix_add_needed_linking.patch
+95_timezone_point_selection.patch