Revert "Reduce scope of variables"

This reverts commit 96c7ebc6dc9e8b8327db04a9570054ee78743353.

2 files changed, 11 insertions, 8 deletions

diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
index b4157344..cf6ef670 100644
--- a/applets/clock/calendar-window.c
+++ b/applets/clock/calendar-window.c
@@ -543,6 +543,8 @@ void
 calendar_window_set_show_weeks (CalendarWindow *calwin,
 				gboolean        show_weeks)
 {
+	GtkCalendarDisplayOptions options;
+
 	g_return_if_fail (CALENDAR_IS_WINDOW (calwin));
 
 	if (show_weeks == calwin->priv->show_weeks)
@@ -551,8 +553,6 @@ calendar_window_set_show_weeks (CalendarWindow *calwin,
 	calwin->priv->show_weeks = show_weeks;
 
 	if (calwin->priv->calendar) {
-		GtkCalendarDisplayOptions options;
-
 		options = gtk_calendar_get_display_options (GTK_CALENDAR (calwin->priv->calendar));
 
 		if (show_weeks)
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index f97e56af..309d4884 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -2219,6 +2219,9 @@ location_set_current_cb (ClockLocation *loc,
 static void
 locations_changed (ClockData *cd)
 {
+        GSList *l;
+        glong id;
+
         if (!cd->locations) {
                 if (cd->weather_obox)
                         gtk_widget_hide (cd->weather_obox);
@@ -2233,9 +2236,8 @@ locations_changed (ClockData *cd)
                         gtk_widget_show (cd->weather_obox);
         }
 
-        for (GSList *l = cd->locations; l; l = l->next) {
+        for (l = cd->locations; l; l = l->next) {
                 ClockLocation *loc = l->data;
-                glong id;
 
                 id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (loc), "weather-updated"));
                 if (id == 0) {
@@ -2512,6 +2514,7 @@ setup_gsettings (ClockData *cd)
 static GSList *
 parse_gsettings_cities (ClockData *cd, gchar **values)
 {
+        gint i;
         LocationParserData data;
         GMarkupParseContext *context;
 
@@ -2521,7 +2524,7 @@ parse_gsettings_cities (ClockData *cd, gchar **values)
         context = g_markup_parse_context_new (&location_parser, 0, &data, NULL);
 
         if (values) {
-            for (gint i = 0; values[i]; i++) {
+            for (i = 0; values[i]; i++) {
                     g_markup_parse_context_parse (context, values[i], strlen(values[i]), NULL);
             }
         }
@@ -2586,11 +2589,11 @@ system_manager_signal_cb (GDBusProxy *proxy,
                           GVariant   *parameters,
                           ClockData  *cd)
 {
+        GVariant *variant;
+        gboolean active;
+
         if (g_strcmp0 (signal_name, "PrepareForSleep") == 0)
         {
-                GVariant *variant;
-                gboolean active;
-
                 variant = g_variant_get_child_value (parameters, 0);
                 active = g_variant_get_boolean (variant);
                 g_variant_unref (variant);