[gnome-panel/wip/gnome-3.10+: 27/75] clock: fix deprecated warnings



commit 14784b959df94b0f5343e26705c01772829b1083
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Jul 9 00:49:19 2014 +0300

    clock: fix deprecated warnings
    
    Bump libgweather required version to 3.9.2

 applets/clock/clock-location.c |    4 ----
 applets/clock/clock.c          |    2 +-
 configure.ac                   |    7 +------
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
index 9e263b4..d2d0e58 100644
--- a/applets/clock/clock-location.c
+++ b/applets/clock/clock-location.c
@@ -541,11 +541,7 @@ setup_weather_updates (ClockLocation *loc)
                priv->weather_timeout = 0;
        }
 
-#ifdef HAVE_GWEATHER_3_9_2_OR_NEWER
        priv->weather_info = gweather_info_new (priv->loc, GWEATHER_FORECAST_LIST);
-#else
-       priv->weather_info = gweather_info_new_for_world (priv->world, priv->loc, GWEATHER_FORECAST_LIST);
-#endif
 
        g_signal_connect (priv->weather_info, "updated",
                          G_CALLBACK (weather_info_updated), loc);
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index a756de1..2f989aa 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -1323,7 +1323,7 @@ fill_clock_applet (PanelApplet *applet)
 
        cd->applet = GTK_WIDGET (applet);
 
-        cd->world = gweather_location_new_world (FALSE);
+        cd->world = gweather_location_get_world ();
         load_cities (cd);
         locations_changed (NULL, NULL, cd);
 
diff --git a/configure.ac b/configure.ac
index 08dd83b..1648f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ TELEPATHY_GLIB_REQUIRED=0.14.0
 LIBECAL_REQUIRED=3.5.3
 LIBEDATASERVER_REQUIRED=3.5.3
 CAIRO_REQUIRED=1.0.0
-GWEATHER_REQUIRED=3.5.1
+GWEATHER_REQUIRED=3.9.2
 DBUS_GLIB_REQUIRED=0.80
 DCONF_REQUIRED=0.13.4
 LIBRSVG_REQUIRED=2.36.2
@@ -133,11 +133,6 @@ PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib
 AC_SUBST(CLOCK_CFLAGS)
 AC_SUBST(CLOCK_LIBS)
 
-PKG_CHECK_MODULES(GWEATHER, gweather-3.0 >= 3.9.2, HAVE_GWEATHER_3_9_2_OR_NEWER=yes, 
HAVE_GWEATHER_3_9_2_OR_NEWER=no)
-if test "x$HAVE_GWEATHER_3_9_2_OR_NEWER" = "xyes" ; then
-    AC_DEFINE(HAVE_GWEATHER_3_9_2_OR_NEWER, 1, [Defined if Gweather version is 3.9.2 or newer])
-fi
-
 # Check whether to enable e-d-s support for clock applet
 AC_MSG_CHECKING([whether to enable evolution-data-server support])
 AC_ARG_ENABLE([eds],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]