From d7538c85af3344a7587c3a51b17da60b8e88d79d Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 18 Feb 2014 16:06:29 +0100 Subject: clocks: use GnomeWallClock to give time change updates Use this to stop showing static times for both clocks. --- shell/clock.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'shell/clock.c') diff --git a/shell/clock.c b/shell/clock.c index b229dda..4a3cf9c 100644 --- a/shell/clock.c +++ b/shell/clock.c @@ -8,8 +8,13 @@ #include "clock.h" +#define GNOME_DESKTOP_USE_UNSTABLE_API +#include + struct WestonGtkClockPrivate { GtkWidget *label; + + GnomeWallClock *wall_clock; }; G_DEFINE_TYPE(WestonGtkClock, weston_gtk_clock, GTK_TYPE_WINDOW) @@ -22,6 +27,25 @@ weston_gtk_clock_init (WestonGtkClock *self) WestonGtkClockPrivate); } +static void +wall_clock_notify_cb (GnomeWallClock *wall_clock, + GParamSpec *pspec, + WestonGtkClock *self) +{ + GDateTime *datetime; + gchar *str; + + datetime = g_date_time_new_now_local (); + + str = g_date_time_format (datetime, + "%H:%M\n" + "%d/%m/%Y"); + gtk_label_set_markup (GTK_LABEL (self->priv->label), str); + + g_free (str); + g_date_time_unref (datetime); +} + static void weston_gtk_clock_constructed (GObject *object) { @@ -29,6 +53,10 @@ weston_gtk_clock_constructed (GObject *object) G_OBJECT_CLASS (weston_gtk_clock_parent_class)->constructed (object); + self->priv->wall_clock = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL); + g_signal_connect (self->priv->wall_clock, "notify::clock", + G_CALLBACK (wall_clock_notify_cb), self); + gtk_window_set_title (GTK_WINDOW (self), "gtk shell"); gtk_window_set_decorated (GTK_WINDOW (self), FALSE); gtk_widget_realize (GTK_WIDGET (self)); @@ -38,11 +66,10 @@ weston_gtk_clock_constructed (GObject *object) "wgs-clock"); self->priv->label = gtk_label_new (""); - gtk_label_set_markup (GTK_LABEL (self->priv->label), - "11:47\n" - "13/02/2014"); gtk_label_set_justify (GTK_LABEL (self->priv->label), GTK_JUSTIFY_CENTER); gtk_container_add (GTK_CONTAINER (self), self->priv->label); + + wall_clock_notify_cb (self->priv->wall_clock, NULL, self); } static void @@ -50,6 +77,10 @@ weston_gtk_clock_dispose (GObject *object) { WestonGtkClock *self = WESTON_GTK_CLOCK (object); + if (self->priv->wall_clock) + g_object_unref (self->priv->wall_clock); + self->priv->wall_clock = NULL; + G_OBJECT_CLASS (weston_gtk_clock_parent_class)->dispose (object); } -- cgit v1.3.1