[gnome-screensaver] Use GnomeWallClock

[Colin Walters <walters src gnome org>]

commit 62c7262736e93dbeb5be80bfc5c7e9200b1f0c01
Author: Colin Walters <walters verbum org>
Date:   Thu Sep 1 12:54:41 2011 -0400

    Use GnomeWallClock
    
    This centralizes clock handling.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657959

 src/gs-window-x11.c |  112 ++++----------------------------------------------
 1 files changed, 9 insertions(+), 103 deletions(-)
---
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 3114c3e..a0de35a 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -34,6 +34,9 @@
 
 #include <gdesktop-enums.h>
 
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnome-desktop/gnome-wall-clock.h>
+
 #include "gs-window.h"
 #include "gs-marshal.h"
 #include "subprocs.h"
@@ -100,9 +103,6 @@ struct GSWindowPrivate
 
         guint      watchdog_timer_id;
         guint      info_bar_timer_id;
-        guint      clock_update_id;
-
-        gint64     clock_update_time;
 
         gint       lock_pid;
         gint       lock_watch_id;
@@ -120,8 +120,7 @@ struct GSWindowPrivate
 
         GTimer    *timer;
 
-        GSettings           *clock_settings;
-        GDesktopClockFormat  clock_format;
+        GnomeWallClock *clock_tracker;
 
 #ifdef HAVE_SHAPE_EXT
         int        shape_event_base;
@@ -152,8 +151,6 @@ static guint           signals [LAST_SIGNAL] = { 0, };
 
 G_DEFINE_TYPE (GSWindow, gs_window, GTK_TYPE_WINDOW)
 
-static void queue_clock_update (GSWindow *window);
-
 static void
 set_invisible_cursor (GdkWindow *window,
                       gboolean   invisible)
@@ -2186,80 +2183,11 @@ on_panel_draw (GtkWidget    *widget,
 static void
 update_clock (GSWindow *window)
 {
-        const char *clock_format;
-        char *text;
         char *markup;
-        GDateTime *dt;
-
-        /* clock */
-        if (window->priv->clock_format == G_DESKTOP_CLOCK_FORMAT_24H)
-                /* Translators, this is the 24h date format used in the panel clock */
-                clock_format = _("%a %R");
-        else
-                /* Translators, this is the 12h date format used in the panel clock */
-                clock_format = _("%a %l:%M %p");
-
-        window->priv->clock_update_time = g_get_real_time ();
-        dt = g_date_time_new_from_unix_local (window->priv->clock_update_time / G_USEC_PER_SEC);
-        text = g_date_time_format (dt, clock_format);
-        markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", text);
+
+        markup = g_strdup_printf ("<b><span foreground=\"#ccc\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker));
         gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
         g_free (markup);
-        g_free (text);
-        g_date_time_unref (dt);
-}
-
-
-static gboolean
-update_clock_timer (GSWindow *window)
-{
-        update_clock (window);
-        queue_clock_update (window);
-        return FALSE;
-}
-
-static gboolean
-check_clock_timer (GSWindow *window)
-{
-        /* Update the panel clock when necessary.
-           This happens:
-
-           - Once a minute in the normal case
-           - When the machine resumes from suspend
-           - When the system time is adjusted
-
-           Right now this function is called much more frequently than any of the
-           above 3 events happen (see queue_clock_update ()).
-
-           We can wake up less often if bug 655129 gets fixed.  */
-        if (ABS (g_get_real_time () - window->priv->clock_update_time) > 60 * G_USEC_PER_SEC) {
-                update_clock (window);
-        }
-
-        queue_clock_update (window);
-        return FALSE;
-}
-
-static void
-queue_clock_update (GSWindow *window)
-{
-        int timeouttime;
-        struct timeval tv;
-
-        gettimeofday (&tv, NULL);
-        timeouttime = (G_USEC_PER_SEC - tv.tv_usec) / 1000 + 1;
-
-        /* time until next minute */
-        timeouttime += 1000 * (59 - tv.tv_sec % 60);
-
-        /* If we are more than 2.5 seconds from the start of the next minute,
-           schedule less precise but more power friendly 2 second add_seconds
-           timeout to check if the system realtime clock has changed under us. */
-        if (timeouttime > 2500) {
-                window->priv->clock_update_id = g_timeout_add_seconds (2, (GSourceFunc)check_clock_timer, window);
-        } else {
-                window->priv->clock_update_id = g_timeout_add (timeouttime, (GSourceFunc)update_clock_timer, window);
-        }
 }
 
 static char *
@@ -2362,20 +2290,6 @@ create_panel (GSWindow *window)
 }
 
 static void
-update_clock_format (GSettings  *settings,
-                     const char *key,
-                     GSWindow   *window)
-{
-        GDesktopClockFormat clock_format;
-
-        clock_format = g_settings_get_enum (settings, key);
-        if (clock_format != window->priv->clock_format) {
-                window->priv->clock_format = clock_format;
-                queue_clock_update (window);
-        }
-}
-
-static void
 gs_window_init (GSWindow *window)
 {
         window->priv = GS_WINDOW_GET_PRIVATE (window);
@@ -2424,12 +2338,8 @@ gs_window_init (GSWindow *window)
         gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->drawing_area, TRUE, TRUE, 0);
         create_info_bar (window);
 
-        window->priv->clock_settings = g_settings_new ("org.gnome.desktop.interface");
-        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->clock_tracker = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL);
         update_clock (window);
-        queue_clock_update (window);
 
         force_no_pixmap_background (window->priv->drawing_area);
 }
@@ -2462,12 +2372,8 @@ gs_window_finalize (GObject *object)
         g_free (window->priv->logout_command);
         g_free (window->priv->keyboard_command);
 
-        if (window->priv->clock_settings) {
-                g_object_unref (window->priv->clock_settings);
-        }
-
-        if (window->priv->clock_update_id > 0) {
-                g_source_remove (window->priv->clock_update_id);
+        if (window->priv->clock_tracker) {
+                g_object_unref (window->priv->clock_tracker);
         }
 
         if (window->priv->info_bar_timer_id > 0) {