[gnome-panel/wip/applets/clock: 1/15] clock: rename CLOCK_LOCATION_TYPE to CLOCK_TYPE_LOCATION

[Alberts Muktupāvels <muktupavels src gnome org>]

commit bdccd106908756a9a351f3ec7495693d0b6cb7c3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Nov 8 13:01:09 2014 +0200

    clock: rename CLOCK_LOCATION_TYPE to CLOCK_TYPE_LOCATION

 applets/clock/clock-location.c |    4 ++--
 applets/clock/clock-location.h |   12 ++++++------
 applets/clock/clock.c          |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
index 57ed061..2ddd47f 100644
--- a/applets/clock/clock-location.c
+++ b/applets/clock/clock-location.c
@@ -55,7 +55,7 @@ static void clock_location_finalize (GObject *);
 static gboolean update_weather_info (gpointer user_data);
 static void setup_weather_updates (ClockLocation *loc);
 
-#define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate))
+#define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_TYPE_LOCATION, ClockLocationPrivate))
 
 ClockLocation *
 clock_location_new (GWeatherLocation *world,
@@ -68,7 +68,7 @@ clock_location_new (GWeatherLocation *world,
         ClockLocation *this;
         ClockLocationPrivate *priv;
 
-        this = g_object_new (CLOCK_LOCATION_TYPE, NULL);
+        this = g_object_new (CLOCK_TYPE_LOCATION, NULL);
         priv = PRIVATE (this);
 
        priv->world = gweather_location_ref (world);
diff --git a/applets/clock/clock-location.h b/applets/clock/clock-location.h
index c14ebb4..5ffde28 100644
--- a/applets/clock/clock-location.h
+++ b/applets/clock/clock-location.h
@@ -8,12 +8,12 @@
 
 G_BEGIN_DECLS
 
-#define CLOCK_LOCATION_TYPE         (clock_location_get_type ())
-#define CLOCK_LOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLOCK_LOCATION_TYPE, ClockLocation))
-#define CLOCK_LOCATION_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), CLOCK_LOCATION_TYPE, ClockLocationClass))
-#define IS_CLOCK_LOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CLOCK_LOCATION_TYPE))
-#define IS_CLOCK_LOCATION_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), CLOCK_LOCATION_TYPE))
-#define CLOCK_LOCATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CLOCK_LOCATION_TYPE, 
ClockLocationClass))
+#define CLOCK_TYPE_LOCATION         (clock_location_get_type ())
+#define CLOCK_LOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLOCK_TYPE_LOCATION, ClockLocation))
+#define CLOCK_LOCATION_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), CLOCK_TYPE_LOCATION, ClockLocationClass))
+#define IS_CLOCK_LOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CLOCK_TYPE_LOCATION))
+#define IS_CLOCK_LOCATION_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), CLOCK_TYPE_LOCATION))
+#define CLOCK_LOCATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CLOCK_TYPE_LOCATION, 
ClockLocationClass))
 
 typedef struct
 {
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index e86cc0e..edf7610 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -586,7 +586,7 @@ create_cities_store (ClockData *cd)
        cd->cities_store = g_object_ref (gtk_list_store_new (COL_CITY_LAST,
                                                              G_TYPE_STRING,            /* COL_CITY_NAME */
                                                              G_TYPE_STRING,            /* COL_CITY_TZ */
-                                                             CLOCK_LOCATION_TYPE));    /* COL_CITY_LOC */
+                                                             CLOCK_TYPE_LOCATION));    /* COL_CITY_LOC */
 
         list = g_list_copy (cities);
         list = g_list_sort (list, sort_locations_by_name);