r1932 - in trunk/src/target/OM-2007/applications/openmoko-today: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-05-09 13:38:26 +0200 (Wed, 09 May 2007)
New Revision: 1932

Modified:
   trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
2007-05-09  Thomas Wood  <thomas at openedhand.com>

	* src/today-main.c: (today_update_date), (create_ui): Remove the clock. Closes bug 469.


Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-05-09 08:43:38 UTC (rev 1931)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog	2007-05-09 11:38:26 UTC (rev 1932)
@@ -1,3 +1,7 @@
+2007-05-09  Thomas Wood  <thomas at openedhand.com>
+
+	* src/today-main.c: (today_update_date), (create_ui): Remove the clock. Closes bug 469.
+
 Fri, 30 Mar 2007 13:18:28 +0200 Dodji Seketeli
 
 	* applications/openmoko-today/src/today-events-area.c:

Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-05-09 08:43:38 UTC (rev 1931)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c	2007-05-09 11:38:26 UTC (rev 1932)
@@ -71,37 +71,11 @@
   }
 
   /* TODO: use something nicer from the locale here */
-  strftime (date_str, sizeof (date_str), "%a %d/%b/%Y", tmp);
-  gtk_label_set_text (label, date_str);
+  strftime (date_str, sizeof (date_str), "<big>%a %d/%b/%Y</big>", tmp);
+  gtk_label_set_markup (label, date_str);
 
 }
 
-/**
- * today_update_time ()
- *
- * Update the specified GtkLabel with the current time
- */
-static void
-today_update_time (GtkLabel * label)
-{
-  time_t t;
-  struct tm *tmp;
-  gchar time_str[64];
-
-  t = time (NULL);
-  tmp = localtime (&t);
-
-  if (tmp == NULL)
-  {
-    // error = could not get localtime
-    return;
-  }
-
-  /* TODO: make 12/24 hr optional */
-  strftime (time_str, sizeof (time_str), "<big>%I:%M</big> %p", tmp);
-  gtk_label_set_markup (label, time_str);
-}
-
 /* information lines */
 
 /**
@@ -262,16 +236,6 @@
   today_update_date (GTK_LABEL (date));
   g_timeout_add (60 * 60 * 1000, (GSourceFunc) today_update_date, date);
 
-  /* time */
-  alignment = gtk_alignment_new (1, 0, 0, 0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 12);
-  time_label = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (time_label), "<big>10:30am</big>");
-  gtk_container_add (GTK_CONTAINER (alignment), time_label);
-  gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-  today_update_time (GTK_LABEL (time_label));
-  g_timeout_add (60 * 1000, (GSourceFunc) today_update_time, time_label);
-
   /* main message */
   alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
   message = gtk_label_new (NULL);