From 704b78d23bf8d707707411608a3453250f2637a1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Nov 2012 16:20:46 +0100 Subject: Replace deprecated GLib symbols (as of GLib 2.34.x) --- modules/cal-config-weather/e-source-weather.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/cal-config-weather') diff --git a/modules/cal-config-weather/e-source-weather.c b/modules/cal-config-weather/e-source-weather.c index 3440224173..4ba306408a 100644 --- a/modules/cal-config-weather/e-source-weather.c +++ b/modules/cal-config-weather/e-source-weather.c @@ -23,7 +23,7 @@ ((obj), E_TYPE_SOURCE_WEATHER, ESourceWeatherPrivate)) struct _ESourceWeatherPrivate { - GMutex *property_lock; + GMutex property_lock; ESourceWeatherUnits units; gchar *location; }; @@ -96,7 +96,7 @@ source_weather_finalize (GObject *object) priv = E_SOURCE_WEATHER_GET_PRIVATE (object); - g_mutex_free (priv->property_lock); + g_mutex_clear (&priv->property_lock); g_free (priv->location); @@ -155,7 +155,7 @@ static void e_source_weather_init (ESourceWeather *extension) { extension->priv = E_SOURCE_WEATHER_GET_PRIVATE (extension); - extension->priv->property_lock = g_mutex_new (); + g_mutex_init (&extension->priv->property_lock); } void @@ -198,12 +198,12 @@ e_source_weather_dup_location (ESourceWeather *extension) g_return_val_if_fail (E_IS_SOURCE_WEATHER (extension), NULL); - g_mutex_lock (extension->priv->property_lock); + g_mutex_lock (&extension->priv->property_lock); protected = e_source_weather_get_location (extension); duplicate = g_strdup (protected); - g_mutex_unlock (extension->priv->property_lock); + g_mutex_unlock (&extension->priv->property_lock); return duplicate; } @@ -216,11 +216,11 @@ e_source_weather_set_location (ESourceWeather *extension, g_return_if_fail (E_IS_SOURCE_WEATHER (extension)); - g_mutex_lock (extension->priv->property_lock); + g_mutex_lock (&extension->priv->property_lock); new_location = e_util_strdup_strip (location); if (g_strcmp0 (extension->priv->location, new_location) == 0) { - g_mutex_unlock (extension->priv->property_lock); + g_mutex_unlock (&extension->priv->property_lock); g_free (new_location); return; } @@ -228,7 +228,7 @@ e_source_weather_set_location (ESourceWeather *extension, g_free (extension->priv->location); extension->priv->location = new_location; - g_mutex_unlock (extension->priv->property_lock); + g_mutex_unlock (&extension->priv->property_lock); g_object_notify (G_OBJECT (extension), "location"); } -- cgit v1.2.3