Merge lp:~ev/timezonemap/timezonelocation into lp:timezonemap

[Evan]

This branch exposes the timezone locations as GObjects. Do you think it's better to do this across the board, as I've done here, or to push the location private struct to the header, so that cc-timezone-map.c can use it?

=== modified file 'src/cc-timezone-map.c'
--- src/cc-timezone-map.c	2011-07-29 09:01:38 +0000
+++ src/cc-timezone-map.c	2011-08-02 08:06:15 +0000
@@ -63,7 +63,7 @@
   gchar *watermark;
 
   TzDB *tzdb;
-  TzLocation *location;
+  CcTimezoneLocation *location;
   GHashTable *alias_db;
 };
 
@@ -813,8 +813,16 @@
       g_clear_error (&err);
     }
 
-  pointx = convert_longtitude_to_x (priv->location->longitude, alloc.width);
-  pointy = convert_latitude_to_y (priv->location->latitude, alloc.height);
+  GValue lat = {0};
+  GValue lon = {0};
+  g_value_init (&lat, G_TYPE_DOUBLE);
+  g_value_init (&lon, G_TYPE_DOUBLE);
+  g_object_get_property(G_OBJECT (priv->location), "latitude", &lat);
+  g_object_get_property(G_OBJECT (priv->location), "longitude", &lon);
+  pointx = convert_longtitude_to_x (g_value_get_double(&lon), alloc.width);
+  pointy = convert_latitude_to_y (g_value_get_double(&lat), alloc.height);
+  g_value_unset (&lon);
+  g_value_unset (&lat);
 
   if (pointy > alloc.height)
     pointy = alloc.height;
@@ -854,20 +862,31 @@
                                             0,
                                             NULL,
                                             NULL,
-                                            g_cclosure_marshal_VOID__POINTER,
+                                            g_cclosure_marshal_VOID__OBJECT,
                                             G_TYPE_NONE, 1,
-                                            G_TYPE_POINTER);
+                                            CC_TYPE_TIMEZONE_LOCATION);
 }
 
 
 static gint
-sort_locations (TzLocation *a,
-                TzLocation *b)
+sort_locations (CcTimezoneLocation *a,
+                CcTimezoneLocation *b)
 {
-  if (a->dist > b->dist)
+  GValue val_a = {0};
+  GValue val_b = {0};
+  gdouble dist_a, dist_b;
+  g_value_init (&val_a, G_TYPE_DOUBLE);
+  g_value_init (&val_b, G_TYPE_DOUBLE);
+  g_object_get_property(G_OBJECT (a), "dist", &val_a);
+  g_object_get_property(G_OBJECT (b), "dist", &val_b);
+  dist_a = g_value_get_double(&val_a);
+  dist_b = g_value_get_double(&val_b);
+  g_value_unset (&val_a);
+  g_value_unset (&val_b);
+  if (dist_a > dist_b)
     return 1;
 
-  if (a->dist < b->dist)
+  if (dist_a < dist_b)
     return -1;
 
   return 0;
@@ -875,7 +894,7 @@
 
 static void
 set_location (CcTimezoneMap *map,
-              TzLocation    *location)
+              CcTimezoneLocation    *location)
 {
   CcTimezoneMapPrivate *priv = map->priv;
   TzInfo *info;
@@ -892,7 +911,7 @@
   tz_info_free (info);
 }
 
-static TzLocation *
+static CcTimezoneLocation *
 get_loc_for_xy (GtkWidget * widget, gint x, gint y)
 {
   CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv;
@@ -906,6 +925,13 @@
   GList *distances = NULL;
   GtkAllocation alloc;
 
+  GValue glon = {0};
+  GValue glat = {0};
+  GValue gdist = {0};
+  g_value_init (&glon, G_TYPE_DOUBLE);
+  g_value_init (&glat, G_TYPE_DOUBLE);
+  g_value_init (&gdist, G_TYPE_DOUBLE);
+
   rowstride = priv->visible_map_rowstride;
   pixels = priv->visible_map_pixels;
 
@@ -937,22 +963,27 @@
   for (i = 0; i < array->len; i++)
     {
       gdouble pointx, pointy, dx, dy;
-      TzLocation *loc = array->pdata[i];
+      CcTimezoneLocation *loc = array->pdata[i];
 
-      pointx = convert_longtitude_to_x (loc->longitude, width);
-      pointy = convert_latitude_to_y (loc->latitude, height);
+      g_object_get_property(G_OBJECT (loc), "longitude", &glon);
+      g_object_get_property(G_OBJECT (loc), "latitude", &glat);
+      pointx = convert_longtitude_to_x (g_value_get_double(&glon), width);
+      pointy = convert_latitude_to_y (g_value_get_double(&glat), height);
 
       dx = pointx - x;
       dy = pointy - y;
 
-      loc->dist = dx * dx + dy * dy;
+      g_value_set_double(&gdist, (gdouble) dx * dx + dy * dy);
+      g_object_set_property(G_OBJECT (loc), "dist", &gdist);
       distances = g_list_prepend (distances, loc);
-
     }
   distances = g_list_sort (distances, (GCompareFunc) sort_locations);
 
-  TzLocation * loc = (TzLocation*) distances->data;
+  CcTimezoneLocation * loc = (CcTimezoneLocation*) distances->data;
 
+  g_value_unset (&glon);
+  g_value_unset (&glat);
+  g_value_unset (&gdist);
   g_list_free (distances);
 
   return loc;
@@ -962,7 +993,7 @@
 button_press_event (GtkWidget      *widget,
                     GdkEventButton *event)
 {
-  TzLocation * loc = get_loc_for_xy (widget, event->x, event->y);
+  CcTimezoneLocation * loc = get_loc_for_xy (widget, event->x, event->y);
   set_location (CC_TIMEZONE_MAP (widget), loc);
   return TRUE;
 }
@@ -1087,6 +1118,8 @@
   GPtrArray *locations;
   guint i;
   char *real_tz;
+  GValue zone = {0};
+  g_value_init (&zone, G_TYPE_STRING);
 
   real_tz = g_hash_table_lookup (map->priv->alias_db, timezone);
 
@@ -1094,9 +1127,10 @@
 
   for (i = 0; i < locations->len; i++)
     {
-      TzLocation *loc = locations->pdata[i];
+      CcTimezoneLocation *loc = locations->pdata[i];
+      g_object_get_property(G_OBJECT (loc), "zone", &zone);
 
-      if (!g_strcmp0 (loc->zone, real_tz ? real_tz : timezone))
+      if (!g_strcmp0 (g_value_get_string(&zone), real_tz ? real_tz : timezone))
         {
           set_location (map, loc);
           break;
@@ -1104,6 +1138,7 @@
     }
 
   gtk_widget_queue_draw (GTK_WIDGET (map));
+  g_value_unset (&zone);
 }
 
 void
@@ -1132,11 +1167,14 @@
   }
   else {
     GtkAllocation alloc;
+    GValue val_zone = {0};
+    g_value_init (&val_zone, G_TYPE_STRING);
     gtk_widget_get_allocation (GTK_WIDGET (map), &alloc);
     x = convert_longtitude_to_x(lon, alloc.width);
     y = convert_latitude_to_y(lat, alloc.height);
-    TzLocation * loc = get_loc_for_xy(GTK_WIDGET (map), x, y);
-    return loc->zone;
+    CcTimezoneLocation * loc = get_loc_for_xy(GTK_WIDGET (map), x, y);
+    g_value_unset (&val_zone);
+    return g_value_get_string(&val_zone);
   }
 }
 
@@ -1150,7 +1188,7 @@
   gtk_widget_queue_draw (GTK_WIDGET (map));
 }
 
-TzLocation *
+CcTimezoneLocation *
 cc_timezone_map_get_location (CcTimezoneMap *map)
 {
   return map->priv->location;
 
=== modified file 'src/cc-timezone-map.h'
--- src/cc-timezone-map.h	2011-07-28 15:18:24 +0000
+++ src/cc-timezone-map.h	2011-08-02 08:06:15 +0000
@@ -78,7 +78,7 @@
                                  gdouble lon, gdouble lat);
 const gchar * cc_timezone_map_get_timezone_at_coords (CcTimezoneMap *map,
                                                       gdouble lon, gdouble lat);
-TzLocation * cc_timezone_map_get_location (CcTimezoneMap *map);
+CcTimezoneLocation * cc_timezone_map_get_location (CcTimezoneMap *map);
 
 G_END_DECLS
 
 
=== modified file 'src/test-timezone.c'
--- src/test-timezone.c	2011-07-28 15:28:24 +0000
+++ src/test-timezone.c	2011-08-02 08:06:15 +0000
@@ -22,14 +22,20 @@
 		return 1;
 	}
 
+	g_type_init();
+	GValue zone = {0};
+	g_value_init(&zone, G_TYPE_STRING);
+
 	db = tz_load_db ();
 	locs = tz_get_locations (db);
 	for (i = 0; i < locs->len ; i++) {
-		TzLocation *loc = locs->pdata[i];
+		CcTimezoneLocation *loc = locs->pdata[i];
+
 		TzInfo *info;
 		char *filename, *path;
 		gdouble selected_offset;
-                char buf[16];
+		char buf[16];
+		g_object_get_property(G_OBJECT (loc), "zone", &zone);
 
 		info = tz_info_from_location (loc);
 		selected_offset = tz_location_get_utc_offset (loc)
@@ -41,7 +47,7 @@
 		path = g_build_filename (pixmap_dir, filename, NULL);
 
 		if (g_file_test (path, G_FILE_TEST_IS_REGULAR) == FALSE) {
-			g_message ("File '%s' missing for zone '%s'", filename, loc->zone);
+			g_message ("File '%s' missing for zone '%s'", filename, g_value_get_string(&zone));
 			retval = 1;
 		}
 
 
=== modified file 'src/tz.c'
--- src/tz.c	2011-07-28 15:18:24 +0000
+++ src/tz.c	2011-08-02 08:06:15 +0000
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <math.h>
 #include <string.h>
+#include <float.h>
 #include "tz.h"
 
 
@@ -40,6 +41,202 @@
 static void sort_locations_by_country (GPtrArray *locations);
 static gchar * tz_data_file_get (void);
 
+G_DEFINE_TYPE (CcTimezoneLocation, cc_timezone_location, G_TYPE_OBJECT)
+
+#define TIMEZONE_LOCATION_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_TIMEZONE_LOCATION, CcTimezoneLocationPrivate))
+
+struct _CcTimezoneLocationPrivate
+{
+	gchar *country;
+	gdouble latitude;
+	gdouble longitude;
+	gchar *zone;
+	gchar *comment;
+
+	gdouble dist; /* distance to clicked point for comparison */
+};
+
+enum {
+  PROP_0,
+  PROP_COUNTRY,
+  PROP_LATITUDE,
+  PROP_LONGITUDE,
+  PROP_ZONE,
+  PROP_COMMENT,
+  PROP_DIST
+};
+
+static void
+cc_timezone_location_get_property (GObject    *object,
+                              guint       property_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  CcTimezoneLocationPrivate *priv = CC_TIMEZONE_LOCATION (object)->priv;
+  switch (property_id)
+    {
+    case PROP_COUNTRY:
+      g_value_set_string (value, priv->country);
+      break;
+    case PROP_LATITUDE:
+      g_value_set_double (value, priv->latitude);
+      break;
+    case PROP_LONGITUDE:
+      g_value_set_double (value, priv->longitude);
+      break;
+    case PROP_ZONE:
+      g_value_set_string (value, priv->zone);
+      break;
+    case PROP_COMMENT:
+      g_value_set_string (value, priv->comment);
+      break;
+    case PROP_DIST:
+      g_value_set_double (value, priv->dist);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+cc_timezone_location_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  CcTimezoneLocationPrivate *priv = CC_TIMEZONE_LOCATION (object)->priv;
+  switch (property_id)
+    {
+    case PROP_COUNTRY:
+      priv->country = g_value_get_string(value);
+      break;
+    case PROP_LATITUDE:
+      priv->latitude = g_value_get_double(value);
+      break;
+    case PROP_LONGITUDE:
+      priv->longitude = g_value_get_double(value);
+      break;
+    case PROP_ZONE:
+      priv->zone = g_value_get_string(value);
+      break;
+    case PROP_COMMENT:
+      priv->comment = g_value_get_string(value);
+      break;
+    case PROP_DIST:
+      priv->dist = g_value_get_double(value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+cc_timezone_location_dispose (GObject *object)
+{
+  CcTimezoneLocationPrivate *priv = CC_TIMEZONE_LOCATION (object)->priv;
+
+  if (priv->country)
+    {
+      g_object_unref (priv->country);
+      priv->country = NULL;
+    }
+
+  if (priv->zone)
+    {
+      g_object_unref (priv->zone);
+      priv->zone = NULL;
+    }
+
+  if (priv->comment)
+    {
+      g_object_unref (priv->comment);
+      priv->comment = NULL;
+    }
+
+  G_OBJECT_CLASS (cc_timezone_location_parent_class)->dispose (object);
+}
+
+static void
+cc_timezone_location_finalize (GObject *object)
+{
+  CcTimezoneLocationPrivate *priv = CC_TIMEZONE_LOCATION (object)->priv;
+  G_OBJECT_CLASS (cc_timezone_location_parent_class)->finalize (object);
+}
+
+static void
+cc_timezone_location_class_init (CcTimezoneLocationClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  g_type_class_add_private (klass, sizeof (CcTimezoneLocationPrivate));
+
+  object_class->get_property = cc_timezone_location_get_property;
+  object_class->set_property = cc_timezone_location_set_property;
+  object_class->dispose = cc_timezone_location_dispose;
+  object_class->finalize = cc_timezone_location_finalize;
+
+  g_object_class_install_property(object_class,
+                                  PROP_COUNTRY,
+                                  g_param_spec_string ("country",
+                                          "Country",
+                                          "The country for the location",
+                                          "",
+                                          G_PARAM_READWRITE));
+  g_object_class_install_property(object_class,
+                                  PROP_LATITUDE,
+                                  g_param_spec_double ("latitude",
+                                          "Latitude",
+                                          "The latitude for the location",
+                                          -90.0,
+                                          90.0,
+                                          0.0,
+                                          G_PARAM_READWRITE));
+  g_object_class_install_property(object_class,
+                                  PROP_LONGITUDE,
+                                  g_param_spec_double ("longitude",
+                                          "Longitude",
+                                          "The longitude for the location",
+                                          -180.0,
+                                          180.0,
+                                          0.0,
+                                          G_PARAM_READWRITE));
+  g_object_class_install_property(object_class,
+                                  PROP_ZONE,
+                                  g_param_spec_string ("zone",
+                                          "Zone",
+                                          "The time zone for the location",
+                                          "",
+                                          G_PARAM_READWRITE));
+  g_object_class_install_property(object_class,
+                                  PROP_COMMENT,
+                                  g_param_spec_string ("Comment",
+                                          "Comment",
+                                          "A comment for the location",
+                                          "",
+                                          G_PARAM_READWRITE));
+  g_object_class_install_property(object_class,
+                                  PROP_DIST,
+                                  g_param_spec_double ("dist",
+                                          "Distance",
+                                          "The distance for the location",
+                                          0.0,
+                                          DBL_MAX,
+                                          0.0,
+                                          G_PARAM_READWRITE));
+}
+
+static void
+cc_timezone_location_init (CcTimezoneLocation *self) {
+  CcTimezoneLocationPrivate *priv;
+  priv = self->priv = TIMEZONE_LOCATION_PRIVATE (self);
+}
+
+CcTimezoneLocation *
+cc_timezone_location_new (void)
+{
+  return g_object_new (CC_TYPE_TIMEZONE_LOCATION, NULL);
+}
+
 
 /* ---------------- *
  * Public interface *
@@ -71,7 +268,7 @@
 	{
 		gchar **tmpstrarr;
 		gchar *latstr, *lngstr, *p;
-		TzLocation *loc;
+		CcTimezoneLocation *loc;
 
 		if (*buf == '#') continue;
 
@@ -84,21 +281,21 @@
 		lngstr = g_strdup (p);
 		*p = '\0';
 		
-		loc = g_new0 (TzLocation, 1);
-		loc->country = g_strdup (tmpstrarr[0]);
-		loc->zone = g_strdup (tmpstrarr[2]);
-		loc->latitude  = convert_pos (latstr, 2);
-		loc->longitude = convert_pos (lngstr, 3);
+		loc = cc_timezone_location_new ();
+		loc->priv->country = g_strdup (tmpstrarr[0]);
+		loc->priv->zone = g_strdup (tmpstrarr[2]);
+		loc->priv->latitude  = convert_pos (latstr, 2);
+		loc->priv->longitude = convert_pos (lngstr, 3);
 		
 #ifdef __sun
 		if (tmpstrarr[3] && *tmpstrarr[3] == '-' && tmpstrarr[4])
 			loc->comment = g_strdup (tmpstrarr[4]);
 
 		if (tmpstrarr[3] && *tmpstrarr[3] != '-' && !islower(loc->zone)) {
-			TzLocation *locgrp;
+			CcTimezoneLocation *locgrp;
 
 			/* duplicate entry */
-			locgrp = g_new0 (TzLocation, 1);
+			locgrp = cc_timezone_location_new ();
 			locgrp->country = g_strdup (tmpstrarr[0]);
 			locgrp->zone = g_strdup (tmpstrarr[3]);
 			locgrp->latitude  = convert_pos (latstr, 2);
@@ -108,7 +305,7 @@
 			g_ptr_array_add (tz_db->locations, (gpointer) locgrp);
 		}
 #else
-		loc->comment = (tmpstrarr[3]) ? g_strdup(tmpstrarr[3]) : NULL;
+		loc->priv->comment = (tmpstrarr[3]) ? g_strdup(tmpstrarr[3]) : NULL;
 #endif
 
 		g_ptr_array_add (tz_db->locations, (gpointer) loc);
@@ -128,32 +325,22 @@
 	return tz_db;
 }    
 
-static void
-tz_location_free (TzLocation *loc)
-{
-	g_free (loc->country);
-	g_free (loc->zone);
-	g_free (loc->comment);
-
-	g_free (loc);
-}
-
 void
 tz_db_free (TzDB *db)
 {
-	g_ptr_array_foreach (db->locations, (GFunc) tz_location_free, NULL);
+	g_ptr_array_foreach (db->locations, (GFunc) g_object_unref, NULL);
 	g_ptr_array_free (db->locations, TRUE);
 	g_free (db);
 }
 
 static gint
-sort_locations (TzLocation *a,
-                TzLocation *b)
+sort_locations (CcTimezoneLocation *a,
+                CcTimezoneLocation *b)
 {
-  if (a->dist > b->dist)
+  if (a->priv->dist > b->priv->dist)
     return 1;
 
-  if (a->dist < b->dist)
+  if (a->priv->dist < b->priv->dist)
     return -1;
 
   return 0;
@@ -201,37 +388,8 @@
 	return db->locations;
 }
 
-
-gchar *
-tz_location_get_country (TzLocation *loc)
-{
-	return loc->country;
-}
-
-
-gchar *
-tz_location_get_zone (TzLocation *loc)
-{
-	return loc->zone;
-}
-
-
-gchar *
-tz_location_get_comment (TzLocation *loc)
-{
-	return loc->comment;
-}
-
-
-void
-tz_location_get_position (TzLocation *loc, double *longitude, double *latitude)
-{
-	*longitude = loc->longitude;
-	*latitude = loc->latitude;
-}
-
 glong
-tz_location_get_utc_offset (TzLocation *loc)
+tz_location_get_utc_offset (CcTimezoneLocation *loc)
 {
 	TzInfo *tz_info;
 	glong offset;
@@ -243,7 +401,7 @@
 }
 
 gint
-tz_location_set_locally (TzLocation *loc)
+tz_location_set_locally (CcTimezoneLocation *loc)
 {
 	time_t curtime;
 	struct tm *curzone;
@@ -251,13 +409,13 @@
 	gint correction = 0;
 
 	g_return_val_if_fail (loc != NULL, 0);
-	g_return_val_if_fail (loc->zone != NULL, 0);
+	g_return_val_if_fail (loc->priv->zone != NULL, 0);
 	
 	curtime = time (NULL);
 	curzone = localtime (&curtime);
 	is_dst = curzone->tm_isdst;
 
-	setenv ("TZ", loc->zone, 1);
+	setenv ("TZ", loc->priv->zone, 1);
 #if 0
 	curtime = time (NULL);
 	curzone = localtime (&curtime);
@@ -274,16 +432,16 @@
 }
 
 TzInfo *
-tz_info_from_location (TzLocation *loc)
+tz_info_from_location (CcTimezoneLocation *loc)
 {
 	TzInfo *tzinfo;
 	time_t curtime;
 	struct tm *curzone;
 	
 	g_return_val_if_fail (loc != NULL, NULL);
-	g_return_val_if_fail (loc->zone != NULL, NULL);
+	g_return_val_if_fail (loc->priv->zone != NULL, NULL);
 	
-	setenv ("TZ", loc->zone, 1);
+	setenv ("TZ", loc->priv->zone, 1);
 	
 #if 0
 	tzset ();
@@ -361,33 +519,13 @@
 	else return t1 - t2/pow (10.0, strlen(fraction));
 }
 
-
-#if 0
-
-/* Currently not working */
-static void
-free_tzdata (TzLocation *tz)
-{
-	
-	if (tz->country)
-	  g_free(tz->country);
-	if (tz->zone)
-	  g_free(tz->zone);
-	if (tz->comment)
-	  g_free(tz->comment);
-	
-	g_free(tz);
-}
-#endif
-
-
 static int
 compare_country_names (const void *a, const void *b)
 {
-	const TzLocation *tza = * (TzLocation **) a;
-	const TzLocation *tzb = * (TzLocation **) b;
+	const CcTimezoneLocation *tza = * (CcTimezoneLocation **) a;
+	const CcTimezoneLocation *tzb = * (CcTimezoneLocation **) b;
 	
-	return strcmp (tza->zone, tzb->zone);
+	return strcmp (tza->priv->zone, tzb->priv->zone);
 }
 
 
 
=== modified file 'src/tz.h'
--- src/tz.h	2011-07-28 15:18:24 +0000
+++ src/tz.h	2011-08-02 08:06:15 +0000
@@ -27,6 +27,7 @@
 #define _E_TZ_H
 
 #include <glib.h>
+#include <glib-object.h>
 
 #ifndef __sun
 #  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
@@ -34,9 +35,50 @@
 #  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
 #endif
 
+G_BEGIN_DECLS
+
+#define CC_TYPE_TIMEZONE_LOCATION cc_timezone_location_get_type()
+
+#define CC_TIMEZONE_LOCATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  CC_TYPE_TIMEZONE_LOCATION, CcTimezoneLocation))
+
+#define CC_TIMEZONE_LOCATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  CC_TYPE_TIMEZONE_LOCATION, CcTimezoneLocationClass))
+
+#define CC_IS_TIMEZONE_LOCATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  CC_TYPE_TIMEZONE_LOCATION))
+
+#define CC_IS_TIMEZONE_LOCATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  CC_TYPE_TIMEZONE_LOCATION))
+
+#define CC_TIMEZONE_LOCATION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  CC_TYPE_TIMEZONE_LOCATION, CcTimezoneLocationClass))
+
 typedef struct _TzDB TzDB;
-typedef struct _TzLocation TzLocation;
 typedef struct _TzInfo TzInfo;
+typedef struct _CcTimezoneLocation CcTimezoneLocation;
+typedef struct _CcTimezoneLocationClass CcTimezoneLocationClass;
+typedef struct _CcTimezoneLocationPrivate CcTimezoneLocationPrivate;
+
+struct _CcTimezoneLocation
+{
+  GObject parent;
+  CcTimezoneLocationPrivate *priv;
+};
+
+struct _CcTimezoneLocationClass
+{
+  GObjectClass parent_class;
+};
+
+GType cc_timezone_location_get_type (void) G_GNUC_CONST;
+
+CcTimezoneLocation *cc_timezone_location_new (void);
 
 
 struct _TzDB
@@ -44,16 +86,6 @@
 	GPtrArray *locations;
 };
 
-struct _TzLocation
-{
-	gchar *country;
-	gdouble latitude;
-	gdouble longitude;
-	gchar *zone;
-	gchar *comment;
-
-	gdouble dist; /* distance to clicked point for comparison */
-};
 
 /* see the glibc info page information on time zone information */
 /*  tzname_normal    is the default name for the timezone */
@@ -73,14 +105,11 @@
 TzDB      *tz_load_db                 (void);
 void       tz_db_free                 (TzDB *db);
 GPtrArray *tz_get_locations           (TzDB *db);
-void       tz_location_get_position   (TzLocation *loc,
-				       double *longitude, double *latitude);
-char      *tz_location_get_country    (TzLocation *loc);
-gchar     *tz_location_get_zone       (TzLocation *loc);
-gchar     *tz_location_get_comment    (TzLocation *loc);
-glong      tz_location_get_utc_offset (TzLocation *loc);
-gint       tz_location_set_locally    (TzLocation *loc);
-TzInfo    *tz_info_from_location      (TzLocation *loc);
+glong      tz_location_get_utc_offset (CcTimezoneLocation *loc);
+gint       tz_location_set_locally    (CcTimezoneLocation *loc);
+TzInfo    *tz_info_from_location      (CcTimezoneLocation *loc);
 void       tz_info_free               (TzInfo *tz_info);
 
+G_END_DECLS
+
 #endif