[gnome-screensaver] Revert "Update clock on resume"

[Ray Strode <halfline src gnome org>]

commit 5b09aa8d10330f99d42ee7c37f739f0811c7ddff
Author: Ray Strode <rstrode redhat com>
Date:   Wed Aug 17 16:19:56 2011 -0400

    Revert "Update clock on resume"
    
    This reverts commit da2148e09ee162481a0ffbc106a37e81ff7af790.
    
    commit 9f98f3a20b5eec6a1fa13e5a4972eadc2d728acf solves the same
    problem in a way that doesn't add a upower-glib dependency, and
    Colin is working on a much better long term solution anyway that
    will invalidate the need for either commit.

 configure.ac        |    1 -
 src/gs-window-x11.c |   17 -----------------
 2 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b2716f9..20d3115 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-	upower-glib >= 0.9.13
         gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 2996e81..c96c9fa 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -32,8 +32,6 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
 
-#include <upower.h>
-
 #include <gdesktop-enums.h>
 
 #include "gs-window.h"
@@ -105,8 +103,6 @@ struct GSWindowPrivate
         guint      clock_update_id;
 
         gint64     clock_update_time;
-        
-        UpClient  *upower_client;
 
         gint       lock_pid;
         gint       lock_watch_id;
@@ -2267,14 +2263,6 @@ queue_clock_update (GSWindow *window)
         }
 }
 
-static void
-on_upower_resume (UpClient    *client,
-                  UpSleepKind  kind,
-                  gpointer     user_data)
-{
-        update_clock (GS_WINDOW (user_data));
-}
-
 static char *
 get_user_display_name (void)
 {
@@ -2441,11 +2429,6 @@ gs_window_init (GSWindow *window)
         window->priv->clock_format = g_settings_get_enum (window->priv->clock_settings, "clock-format");
         g_signal_connect (window->priv->clock_settings, "changed::clock-format",
                           G_CALLBACK (update_clock_format), window);
-        
-        window->priv->upower_client = up_client_new ();
-        g_signal_connect (window->priv->upower_client, "notify-resume",
-                          G_CALLBACK (on_upower_resume), window);
-        
         update_clock (window);
         queue_clock_update (window);